Compare commits
49
Commits
0dd14c5d5e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b9e8a96774 | ||
|
|
d660079c02 | ||
|
|
acfa726e61 | ||
|
|
d9378056f4 | ||
|
|
c307426f4e | ||
|
|
977dee3cb2 | ||
|
|
bca0b34636 | ||
|
|
e228d999dd | ||
|
|
aff8a9e443 | ||
|
|
25364f4523 | ||
|
|
0cd34f3037 | ||
|
|
cff493f5dd | ||
|
|
543e6eaa50 | ||
|
|
7baa32f400 | ||
|
|
e977ab77a8 | ||
|
|
8a1723e99f | ||
|
|
c06597aba2 | ||
|
|
7f3458b3ef | ||
|
|
4a32e32114 | ||
|
|
9c556ff8b9 | ||
|
|
171d8d922d | ||
|
|
848d2aca1a | ||
|
|
7f7fc1296e | ||
|
|
f62c345e2b | ||
|
|
9ae8b34005 | ||
|
|
a0e134756c | ||
|
|
97f9082f5e | ||
|
|
90b37ec708 | ||
|
|
4082adba25 | ||
|
|
b3805123b5 | ||
|
|
896b89f3b0 | ||
|
|
4a5c92f0e9 | ||
|
|
e5a5edcaae | ||
|
|
9a6bd8a714 | ||
|
|
d45c96c259 | ||
|
|
42b4e1d7e6 | ||
|
|
309614c979 | ||
|
|
98dda99c5c | ||
|
|
8e0f828dd4 | ||
|
|
9aa8690e33 | ||
|
|
dadba4d545 | ||
|
|
fffbb08d36 | ||
|
|
c247dd0217 | ||
|
|
b9a0604426 | ||
|
|
9f16e2aa56 | ||
|
|
010fa29ce0 | ||
|
|
395d58464d | ||
|
|
83c57ac96b | ||
|
|
45c19cac20 |
No files matched your search
@@ -11,7 +11,7 @@ Useful on its own: a Telegram where nothing disappears. In the [beaver](https://
|
||||
- **Voice** transcribed through Telegram's own transcription (Premium), queued when the quota runs out.
|
||||
- **Presence** as a time series (TimescaleDB), read receipts, stories.
|
||||
- **Capture policy** from your Telegram folders with per-chat overrides: channels nothing, groups messages only, private chats everything, by default.
|
||||
- **Annotations and watches**: your notes on chats and rules that fire alerts, both yours to write in the web client.
|
||||
- **Annotations and watches**: your notes on messages, with `#tags` and one list of them all, and rules that fire alerts, both yours to write in the web client.
|
||||
- **Watched bots**: bot tokens you add in the web client. Each one logs in over MTProto (`auth.importBotAuthorization`, the same door a bot-login client uses), backfills the history of the bot's dialogs once and then keeps the incoming stream: who writes to the bot, what, and when. A separate authorization, so it does not take `getUpdates` away from whoever runs that bot over the Bot API.
|
||||
|
||||
Nothing is ever deleted from the archive.
|
||||
@@ -19,12 +19,12 @@ Nothing is ever deleted from the archive.
|
||||
## Parts
|
||||
|
||||
- `backend/` - `userbot` (kurigram, the capture loop and jobs), `watcher` (kurigram again, one bot-token session per watched bot) and `api` (FastAPI: the web API, the MCP server, and the built frontend as static files).
|
||||
- `frontend/` - SvelteKit, `adapter-static`; a chat client over the archive: folders, chat list, thread with media, versions and the deleted messages inline, search, stories, presence graphs.
|
||||
- `frontend/` - SvelteKit, `adapter-static`; a chat client over the archive: folders, chat list, thread with media, versions and the deleted messages inline, a feed of what was deleted or edited across chats, search, stories, presence graphs.
|
||||
- `docker-compose.yml` - includes `backend/` (Postgres with TimescaleDB, `userbot`, `api`) and `frontend/` (the dev server); profiles `external` and `services`.
|
||||
|
||||
## MCP
|
||||
|
||||
Read-only: `list_watched_bots`, `get_bot_stats`, `get_bot_updates`, `search_messages_tool`, `list_chats`, `get_chat_history` (with deleted messages included), `get_deleted_messages`, `get_message_versions`, `get_media`, `get_callbacks`, `presence_history`, `presence_stats`, `get_peer_history`, `get_person`, `get_stories`, `get_annotations`, `list_watches`, `list_alerts`. The one write is `set_watch`. There are no send, edit or delete tools and there will not be.
|
||||
Read-only: `search_messages_tool`, `list_chats`, `get_chat_history` (a readable transcript, deleted messages included) and `get_chat_history_raw` (the same as JSON), `get_deleted_messages`, `get_feed` (deleted and edited messages and profile changes across chats), `get_message_versions`, `get_media`, `get_callbacks`, `get_read_info`, `presence_history`, `presence_stats`, `get_peer_history`, `get_person`, `get_stories`, `get_annotations`, `list_watches`, `list_alerts`. Two tools write: `set_watch`, and `download_media`, which pulls any attachment and leaves a public link to it for a day, visible and revocable in the web client. There are no send, edit or delete tools and there will not be.
|
||||
|
||||
## Run
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/astral-sh/uv:python3.13-trixie-slim@sha256:7dd72af08bdef012fdf433082190d2b5133a96b6a43aca0bb71c2aa793e47e20
|
||||
FROM ghcr.io/astral-sh/uv:python3.13-trixie-slim@sha256:331fbb158258608b9391e802305a9a2c9e42d689435c1d98706647122a122ab0
|
||||
|
||||
RUN apt-get update && apt-get install -y build-essential && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
"""edit versions everywhere
|
||||
|
||||
Revision ID: a2c4e6f8b1d3
|
||||
Revises: e8b3f1a6c2d4
|
||||
Create Date: 2026-10-19 02:30:00.000000
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
|
||||
revision: str = "a2c4e6f8b1d3"
|
||||
down_revision: str | None = "e8b3f1a6c2d4"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute(
|
||||
"UPDATE capture_policy SET track_edits_deletes = TRUE, updated_at = now() "
|
||||
"WHERE scope_type IN ('default_group', 'default_channel') "
|
||||
"AND NOT track_edits_deletes"
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute(
|
||||
"UPDATE capture_policy SET track_edits_deletes = FALSE, updated_at = now() "
|
||||
"WHERE scope_type IN ('default_group', 'default_channel') "
|
||||
"AND track_edits_deletes"
|
||||
)
|
||||
@@ -0,0 +1,198 @@
|
||||
"""feed of deleted and edited messages
|
||||
|
||||
Revision ID: b3d5f7a9c2e4
|
||||
Revises: a2c4e6f8b1d3
|
||||
Create Date: 2026-10-19 02:40:00.000000
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
|
||||
revision: str = "b3d5f7a9c2e4"
|
||||
down_revision: str | None = "a2c4e6f8b1d3"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
_ITEMS = """
|
||||
CREATE TABLE feed_items (
|
||||
id bigserial PRIMARY KEY,
|
||||
account_id integer NOT NULL,
|
||||
kind text NOT NULL,
|
||||
chat_id bigint NOT NULL,
|
||||
chat_kind text NOT NULL,
|
||||
message_id bigint NOT NULL,
|
||||
message_date timestamptz,
|
||||
at timestamptz NOT NULL,
|
||||
since timestamptz NOT NULL,
|
||||
message_count integer NOT NULL DEFAULT 1
|
||||
)
|
||||
"""
|
||||
|
||||
_SEEN = """
|
||||
CREATE TABLE feed_seen (
|
||||
account_id integer PRIMARY KEY,
|
||||
seen_at timestamptz NOT NULL
|
||||
)
|
||||
"""
|
||||
|
||||
_CHAT_KIND = """
|
||||
CREATE FUNCTION feed_chat_kind(chat_id bigint, chat_type text)
|
||||
RETURNS text LANGUAGE sql IMMUTABLE AS $$
|
||||
SELECT CASE
|
||||
WHEN chat_id > 0 THEN 'dm'
|
||||
WHEN chat_type = 'ChatType.CHANNEL' THEN 'channel'
|
||||
ELSE 'group' END
|
||||
$$
|
||||
"""
|
||||
|
||||
_MESSAGE_DATE = """
|
||||
CREATE FUNCTION feed_message_date(stamp text)
|
||||
RETURNS timestamptz LANGUAGE sql STABLE AS $$
|
||||
SELECT CASE
|
||||
WHEN stamp ~ '^\\d{4}-\\d{2}-\\d{2}[ T]\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?$'
|
||||
THEN stamp::timestamp AT TIME ZONE 'UTC' END
|
||||
$$
|
||||
"""
|
||||
|
||||
_ON_DELETE = """
|
||||
CREATE FUNCTION feed_on_delete() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
DECLARE
|
||||
item feed_items%ROWTYPE;
|
||||
BEGIN
|
||||
SELECT * INTO item FROM feed_items
|
||||
WHERE account_id = NEW.account_id AND chat_id = NEW.chat_id
|
||||
AND kind = 'deleted'
|
||||
ORDER BY at DESC, id DESC LIMIT 1;
|
||||
IF FOUND AND NEW.deleted_at BETWEEN item.since - interval '5 seconds'
|
||||
AND item.at + interval '5 seconds' THEN
|
||||
IF (NEW.date, NEW.message_id) > (item.message_date, item.message_id) THEN
|
||||
item.message_id := NEW.message_id;
|
||||
item.message_date := NEW.date;
|
||||
END IF;
|
||||
UPDATE feed_items SET
|
||||
message_count = message_count + 1,
|
||||
at = greatest(at, NEW.deleted_at),
|
||||
since = least(since, NEW.deleted_at),
|
||||
message_id = item.message_id,
|
||||
message_date = item.message_date
|
||||
WHERE id = item.id;
|
||||
ELSE
|
||||
INSERT INTO feed_items
|
||||
(account_id, kind, chat_id, chat_kind, message_id, message_date,
|
||||
at, since)
|
||||
VALUES (NEW.account_id, 'deleted', NEW.chat_id,
|
||||
feed_chat_kind(NEW.chat_id, NEW.raw->'chat'->>'type'),
|
||||
NEW.message_id, NEW.date, NEW.deleted_at, NEW.deleted_at);
|
||||
END IF;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_ON_VERSION = """
|
||||
CREATE FUNCTION feed_on_version() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
IF NEW.edit_date IS NULL AND NOT EXISTS (
|
||||
SELECT 1 FROM message_versions v
|
||||
WHERE v.account_id = NEW.account_id AND v.chat_id = NEW.chat_id
|
||||
AND v.message_id = NEW.message_id AND v.observed_at < NEW.observed_at
|
||||
) THEN
|
||||
RETURN NULL;
|
||||
END IF;
|
||||
INSERT INTO feed_items
|
||||
(account_id, kind, chat_id, chat_kind, message_id, message_date, at, since)
|
||||
VALUES (NEW.account_id, 'edited', NEW.chat_id,
|
||||
feed_chat_kind(NEW.chat_id, NEW.raw->'chat'->>'type'),
|
||||
NEW.message_id, feed_message_date(NEW.raw->>'date'),
|
||||
NEW.observed_at, NEW.observed_at);
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_BACKFILL = """
|
||||
WITH d AS (
|
||||
SELECT account_id, chat_id, message_id, date, deleted_at,
|
||||
raw->'chat'->>'type' AS chat_type,
|
||||
deleted_at - lag(deleted_at) OVER (
|
||||
PARTITION BY account_id, chat_id ORDER BY deleted_at, message_id
|
||||
) AS gap
|
||||
FROM messages WHERE deleted_at IS NOT NULL
|
||||
), b AS (
|
||||
SELECT *, count(*) FILTER (WHERE gap IS NULL OR gap > interval '5 seconds')
|
||||
OVER (PARTITION BY account_id, chat_id ORDER BY deleted_at, message_id)
|
||||
AS burst
|
||||
FROM d
|
||||
), deleted AS (
|
||||
SELECT account_id, 'deleted' AS kind, chat_id,
|
||||
feed_chat_kind(chat_id,
|
||||
(array_agg(chat_type ORDER BY date DESC, message_id DESC))[1])
|
||||
AS chat_kind,
|
||||
(array_agg(message_id ORDER BY date DESC, message_id DESC))[1]
|
||||
AS message_id,
|
||||
max(date) AS message_date, max(deleted_at) AS at,
|
||||
min(deleted_at) AS since, count(*)::integer AS message_count
|
||||
FROM b GROUP BY account_id, chat_id, burst
|
||||
), edited AS (
|
||||
SELECT v.account_id, 'edited' AS kind, v.chat_id,
|
||||
feed_chat_kind(v.chat_id, v.raw->'chat'->>'type') AS chat_kind,
|
||||
v.message_id, feed_message_date(v.raw->>'date') AS message_date,
|
||||
v.observed_at AS at, v.observed_at AS since, 1 AS message_count
|
||||
FROM message_versions v
|
||||
WHERE v.edit_date IS NOT NULL OR EXISTS (
|
||||
SELECT 1 FROM message_versions p
|
||||
WHERE p.account_id = v.account_id AND p.chat_id = v.chat_id
|
||||
AND p.message_id = v.message_id AND p.observed_at < v.observed_at
|
||||
)
|
||||
)
|
||||
INSERT INTO feed_items
|
||||
(account_id, kind, chat_id, chat_kind, message_id, message_date, at, since,
|
||||
message_count)
|
||||
SELECT * FROM (SELECT * FROM deleted UNION ALL SELECT * FROM edited) items
|
||||
ORDER BY at, chat_id, message_id
|
||||
"""
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute("SET LOCAL jit = off")
|
||||
op.execute(_ITEMS)
|
||||
op.execute(_SEEN)
|
||||
op.execute(_CHAT_KIND)
|
||||
op.execute(_MESSAGE_DATE)
|
||||
op.execute(_ON_DELETE)
|
||||
op.execute(_ON_VERSION)
|
||||
op.execute(
|
||||
"CREATE TRIGGER messages_feed_deleted AFTER UPDATE OF deleted_at "
|
||||
"ON messages FOR EACH ROW "
|
||||
"WHEN (OLD.deleted_at IS NULL AND NEW.deleted_at IS NOT NULL) "
|
||||
"EXECUTE FUNCTION feed_on_delete()"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE TRIGGER message_versions_feed AFTER INSERT ON message_versions "
|
||||
"FOR EACH ROW EXECUTE FUNCTION feed_on_version()"
|
||||
)
|
||||
op.execute(_BACKFILL)
|
||||
op.execute(
|
||||
"CREATE INDEX ix_feed_items_recent ON feed_items (account_id, at DESC, id DESC)"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE INDEX ix_feed_items_chat ON feed_items "
|
||||
"(account_id, chat_id, at DESC, id DESC)"
|
||||
)
|
||||
op.execute(
|
||||
"INSERT INTO feed_seen (account_id, seen_at) SELECT account_id, now() "
|
||||
"FROM accounts"
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("DROP TRIGGER IF EXISTS message_versions_feed ON message_versions")
|
||||
op.execute("DROP TRIGGER IF EXISTS messages_feed_deleted ON messages")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_on_version()")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_on_delete()")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_message_date(text)")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_chat_kind(bigint, text)")
|
||||
op.execute("DROP TABLE IF EXISTS feed_seen")
|
||||
op.execute("DROP TABLE IF EXISTS feed_items")
|
||||
@@ -0,0 +1,321 @@
|
||||
"""feed of profile changes and chat renames
|
||||
|
||||
Revision ID: c5e7a9b1d3f6
|
||||
Revises: b3d5f7a9c2e4
|
||||
Create Date: 2026-10-19 04:00:00.000000
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
|
||||
revision: str = "c5e7a9b1d3f6"
|
||||
down_revision: str | None = "b3d5f7a9c2e4"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
_PEER_VALUE = """
|
||||
CREATE FUNCTION feed_peer_value(
|
||||
field text, first_name text, last_name text, username text, photo text
|
||||
) RETURNS text LANGUAGE sql IMMUTABLE AS $$
|
||||
SELECT CASE field
|
||||
WHEN 'name' THEN NULLIF(trim(concat_ws(' ', first_name, last_name)), '')
|
||||
WHEN 'username' THEN NULLIF(username, '')
|
||||
WHEN 'photo' THEN NULLIF(photo, '') END
|
||||
$$
|
||||
"""
|
||||
|
||||
_PEER_SCOPE = """
|
||||
CREATE FUNCTION feed_peer_in_scope(account integer, peer bigint)
|
||||
RETURNS boolean LANGUAGE sql STABLE AS $$
|
||||
SELECT EXISTS (
|
||||
SELECT 1 FROM dialogs WHERE account_id = account AND chat_id = peer
|
||||
) OR EXISTS (
|
||||
SELECT 1 FROM peers
|
||||
WHERE account_id = account AND peer_id = peer
|
||||
AND (raw->>'is_contact' = 'true' OR raw->>'contact' = 'true')
|
||||
)
|
||||
$$
|
||||
"""
|
||||
|
||||
_MERGE_DETAIL = """
|
||||
CREATE FUNCTION feed_merge_detail(base jsonb, incoming jsonb)
|
||||
RETURNS jsonb LANGUAGE sql IMMUTABLE AS $$
|
||||
SELECT coalesce(jsonb_object_agg(key, pair), '{}'::jsonb)
|
||||
FROM (
|
||||
SELECT key, jsonb_build_array(
|
||||
coalesce(base->key->0, incoming->key->0),
|
||||
coalesce(incoming->key->1, base->key->1)) AS pair
|
||||
FROM (
|
||||
SELECT jsonb_object_keys(coalesce(base, '{}'::jsonb)) AS key
|
||||
UNION
|
||||
SELECT jsonb_object_keys(incoming)
|
||||
) keys
|
||||
) merged
|
||||
WHERE pair->0 IS DISTINCT FROM pair->1
|
||||
$$
|
||||
"""
|
||||
|
||||
_UPSERT = """
|
||||
CREATE FUNCTION feed_profile_upsert(
|
||||
account integer, chat bigint, kind_of_chat text, message bigint,
|
||||
changed_at timestamptz, changes jsonb
|
||||
) RETURNS void LANGUAGE plpgsql AS $$
|
||||
DECLARE
|
||||
item feed_items%ROWTYPE;
|
||||
merged jsonb;
|
||||
BEGIN
|
||||
SELECT * INTO item FROM feed_items
|
||||
WHERE account_id = account AND chat_id = chat AND kind = 'profile'
|
||||
ORDER BY at DESC, id DESC LIMIT 1;
|
||||
IF FOUND AND changed_at BETWEEN item.since - interval '1 day'
|
||||
AND item.at + interval '1 day' THEN
|
||||
merged := feed_merge_detail(item.detail, changes);
|
||||
IF merged = '{}'::jsonb THEN
|
||||
DELETE FROM feed_items WHERE id = item.id;
|
||||
ELSE
|
||||
UPDATE feed_items SET
|
||||
detail = merged,
|
||||
message_count = message_count
|
||||
+ (SELECT count(*) FROM jsonb_object_keys(changes)),
|
||||
at = greatest(at, changed_at),
|
||||
since = least(since, changed_at),
|
||||
message_id = greatest(message_id, message)
|
||||
WHERE id = item.id;
|
||||
END IF;
|
||||
ELSE
|
||||
INSERT INTO feed_items
|
||||
(account_id, kind, chat_id, chat_kind, message_id, at, since,
|
||||
message_count, detail)
|
||||
VALUES (account, 'profile', chat, kind_of_chat, message, changed_at,
|
||||
changed_at,
|
||||
(SELECT count(*) FROM jsonb_object_keys(changes)), changes);
|
||||
END IF;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_ON_PEER = """
|
||||
CREATE FUNCTION feed_on_peer_change() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
DECLARE
|
||||
changes jsonb := '{}'::jsonb;
|
||||
field text;
|
||||
fresh text;
|
||||
old text;
|
||||
BEGIN
|
||||
IF NEW.peer_id <= 0 OR NOT feed_peer_in_scope(NEW.account_id, NEW.peer_id) THEN
|
||||
RETURN NULL;
|
||||
END IF;
|
||||
FOREACH field IN ARRAY ARRAY['name', 'username', 'photo'] LOOP
|
||||
fresh := feed_peer_value(field, NEW.first_name, NEW.last_name,
|
||||
NEW.username, NEW.photo_unique_id);
|
||||
CONTINUE WHEN fresh IS NULL;
|
||||
SELECT value INTO old FROM (
|
||||
SELECT feed_peer_value(field, h.first_name, h.last_name, h.username,
|
||||
h.photo_unique_id) AS value, h.observed_at
|
||||
FROM peer_history h
|
||||
WHERE h.account_id = NEW.account_id AND h.peer_id = NEW.peer_id
|
||||
AND h.observed_at < NEW.observed_at
|
||||
) earlier
|
||||
WHERE value IS NOT NULL
|
||||
ORDER BY observed_at DESC LIMIT 1;
|
||||
CONTINUE WHEN old IS NULL OR old = fresh;
|
||||
CONTINUE WHEN EXISTS (
|
||||
SELECT 1 FROM peer_history h
|
||||
WHERE h.account_id = NEW.account_id AND h.peer_id = NEW.peer_id
|
||||
AND h.observed_at < NEW.observed_at
|
||||
AND feed_peer_value(field, h.first_name, h.last_name, h.username,
|
||||
h.photo_unique_id) = fresh
|
||||
);
|
||||
changes := changes || jsonb_build_object(field, jsonb_build_array(old, fresh));
|
||||
END LOOP;
|
||||
IF changes <> '{}'::jsonb THEN
|
||||
PERFORM feed_profile_upsert(NEW.account_id, NEW.peer_id, 'dm', 0,
|
||||
NEW.observed_at, changes);
|
||||
END IF;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_ON_TITLE = """
|
||||
CREATE FUNCTION feed_on_chat_title() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
DECLARE
|
||||
previous text;
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM dialogs
|
||||
WHERE account_id = NEW.account_id AND chat_id = NEW.chat_id
|
||||
) THEN
|
||||
RETURN NULL;
|
||||
END IF;
|
||||
SELECT title INTO previous FROM chat_history
|
||||
WHERE account_id = NEW.account_id AND chat_id = NEW.chat_id
|
||||
AND event IN ('meta', 'title') AND title IS NOT NULL
|
||||
AND (ts, message_id) < (NEW.ts, NEW.message_id)
|
||||
ORDER BY ts DESC, message_id DESC LIMIT 1;
|
||||
IF previous IS NULL OR previous = NEW.title THEN
|
||||
RETURN NULL;
|
||||
END IF;
|
||||
PERFORM feed_profile_upsert(
|
||||
NEW.account_id, NEW.chat_id,
|
||||
feed_chat_kind(NEW.chat_id, NEW.raw->'chat'->>'type'),
|
||||
CASE WHEN NEW.event = 'title' THEN NEW.message_id ELSE 0 END,
|
||||
NEW.ts, jsonb_build_object('title', jsonb_build_array(previous, NEW.title)));
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_BACKFILL_PEERS = """
|
||||
WITH scope AS (
|
||||
SELECT account_id::integer AS account_id, chat_id AS peer_id
|
||||
FROM dialogs WHERE chat_id > 0
|
||||
UNION
|
||||
SELECT account_id, peer_id FROM peers
|
||||
WHERE raw->>'is_contact' = 'true' OR raw->>'contact' = 'true'
|
||||
), firsts AS (
|
||||
SELECT h.account_id, h.peer_id, f.field, f.value,
|
||||
min(h.observed_at) AS at
|
||||
FROM peer_history h
|
||||
JOIN scope s ON s.account_id = h.account_id AND s.peer_id = h.peer_id
|
||||
CROSS JOIN LATERAL (
|
||||
SELECT field, feed_peer_value(field, h.first_name, h.last_name,
|
||||
h.username, h.photo_unique_id) AS value
|
||||
FROM unnest(ARRAY['name', 'username', 'photo']) AS field
|
||||
) f
|
||||
WHERE f.value IS NOT NULL
|
||||
GROUP BY 1, 2, 3, 4
|
||||
), ranked AS (
|
||||
SELECT *, row_number() OVER (
|
||||
PARTITION BY account_id, peer_id, field ORDER BY at
|
||||
) AS position
|
||||
FROM firsts
|
||||
), changes AS (
|
||||
SELECT r.account_id, r.peer_id, r.field, r.value AS fresh, r.at, o.value AS old
|
||||
FROM ranked r
|
||||
CROSS JOIN LATERAL (
|
||||
SELECT value FROM (
|
||||
SELECT feed_peer_value(r.field, h.first_name, h.last_name,
|
||||
h.username, h.photo_unique_id) AS value,
|
||||
h.observed_at
|
||||
FROM peer_history h
|
||||
WHERE h.account_id = r.account_id AND h.peer_id = r.peer_id
|
||||
AND h.observed_at < r.at
|
||||
) earlier
|
||||
WHERE value IS NOT NULL
|
||||
ORDER BY observed_at DESC LIMIT 1
|
||||
) o
|
||||
WHERE r.position > 1 AND r.at > now() - interval '90 days'
|
||||
AND o.value <> r.value
|
||||
), gaps AS (
|
||||
SELECT *, at - lag(at) OVER (PARTITION BY account_id, peer_id ORDER BY at)
|
||||
AS gap
|
||||
FROM changes
|
||||
), bursts AS (
|
||||
SELECT *, count(*) FILTER (WHERE gap IS NULL OR gap > interval '1 day')
|
||||
OVER (PARTITION BY account_id, peer_id ORDER BY at) AS burst
|
||||
FROM gaps
|
||||
), fields AS (
|
||||
SELECT account_id, peer_id, burst, field,
|
||||
(array_agg(old ORDER BY at))[1] AS old,
|
||||
(array_agg(fresh ORDER BY at DESC))[1] AS fresh,
|
||||
count(*) AS changes, min(at) AS since, max(at) AS at
|
||||
FROM bursts GROUP BY 1, 2, 3, 4
|
||||
)
|
||||
INSERT INTO feed_items
|
||||
(account_id, kind, chat_id, chat_kind, message_id, at, since,
|
||||
message_count, detail)
|
||||
SELECT account_id, 'profile', peer_id, 'dm', 0, max(at), min(since),
|
||||
sum(changes)::integer,
|
||||
jsonb_object_agg(field, jsonb_build_array(old, fresh))
|
||||
FILTER (WHERE old <> fresh)
|
||||
FROM fields
|
||||
GROUP BY account_id, peer_id, burst
|
||||
HAVING bool_or(old <> fresh)
|
||||
ORDER BY max(at)
|
||||
"""
|
||||
|
||||
_BACKFILL_CHATS = """
|
||||
WITH titles AS (
|
||||
SELECT account_id, chat_id, message_id, event, ts, title,
|
||||
raw->'chat'->>'type' AS chat_type,
|
||||
lag(title) OVER (
|
||||
PARTITION BY account_id, chat_id ORDER BY ts, message_id
|
||||
) AS previous
|
||||
FROM chat_history
|
||||
WHERE event IN ('meta', 'title') AND title IS NOT NULL
|
||||
), changes AS (
|
||||
SELECT * FROM titles t
|
||||
WHERE previous IS NOT NULL AND previous <> title
|
||||
AND ts > now() - interval '90 days'
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM dialogs d
|
||||
WHERE d.account_id = t.account_id AND d.chat_id = t.chat_id
|
||||
)
|
||||
), gaps AS (
|
||||
SELECT *, ts - lag(ts) OVER (PARTITION BY account_id, chat_id ORDER BY ts)
|
||||
AS gap
|
||||
FROM changes
|
||||
), bursts AS (
|
||||
SELECT *, count(*) FILTER (WHERE gap IS NULL OR gap > interval '1 day')
|
||||
OVER (PARTITION BY account_id, chat_id ORDER BY ts) AS burst
|
||||
FROM gaps
|
||||
), grouped AS (
|
||||
SELECT account_id, chat_id, burst,
|
||||
(array_agg(chat_type ORDER BY ts DESC))[1] AS chat_type,
|
||||
max(CASE WHEN event = 'title' THEN message_id ELSE 0 END) AS message_id,
|
||||
(array_agg(previous ORDER BY ts))[1] AS old,
|
||||
(array_agg(title ORDER BY ts DESC))[1] AS fresh,
|
||||
count(*) AS changes, min(ts) AS since, max(ts) AS at
|
||||
FROM bursts GROUP BY 1, 2, 3
|
||||
)
|
||||
INSERT INTO feed_items
|
||||
(account_id, kind, chat_id, chat_kind, message_id, at, since,
|
||||
message_count, detail)
|
||||
SELECT account_id, 'profile', chat_id, feed_chat_kind(chat_id, chat_type),
|
||||
message_id, at, since, changes::integer,
|
||||
jsonb_build_object('title', jsonb_build_array(old, fresh))
|
||||
FROM grouped
|
||||
WHERE old <> fresh
|
||||
ORDER BY at
|
||||
"""
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute("SET LOCAL jit = off")
|
||||
op.execute("ALTER TABLE feed_items ADD COLUMN detail jsonb")
|
||||
op.execute(_PEER_VALUE)
|
||||
op.execute(_PEER_SCOPE)
|
||||
op.execute(_MERGE_DETAIL)
|
||||
op.execute(_UPSERT)
|
||||
op.execute(_ON_PEER)
|
||||
op.execute(_ON_TITLE)
|
||||
op.execute(
|
||||
"CREATE TRIGGER peer_history_feed AFTER INSERT ON peer_history "
|
||||
"FOR EACH ROW EXECUTE FUNCTION feed_on_peer_change()"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE TRIGGER chat_history_feed AFTER INSERT ON chat_history "
|
||||
"FOR EACH ROW WHEN (NEW.event IN ('meta', 'title') AND NEW.title IS NOT NULL) "
|
||||
"EXECUTE FUNCTION feed_on_chat_title()"
|
||||
)
|
||||
op.execute(_BACKFILL_PEERS)
|
||||
op.execute(_BACKFILL_CHATS)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("DROP TRIGGER IF EXISTS chat_history_feed ON chat_history")
|
||||
op.execute("DROP TRIGGER IF EXISTS peer_history_feed ON peer_history")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_on_chat_title()")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_on_peer_change()")
|
||||
op.execute(
|
||||
"DROP FUNCTION IF EXISTS "
|
||||
"feed_profile_upsert(integer, bigint, text, bigint, timestamptz, jsonb)"
|
||||
)
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_merge_detail(jsonb, jsonb)")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_peer_in_scope(integer, bigint)")
|
||||
op.execute("DROP FUNCTION IF EXISTS feed_peer_value(text, text, text, text, text)")
|
||||
op.execute("DELETE FROM feed_items WHERE kind = 'profile'")
|
||||
op.execute("ALTER TABLE feed_items DROP COLUMN detail")
|
||||
@@ -0,0 +1,148 @@
|
||||
"""message search index outside the hypertable, versions searchable
|
||||
|
||||
Revision ID: d8f1a6c3e5b7
|
||||
Revises: c5e7a9b1d3f6
|
||||
Create Date: 2026-10-19 03:00:00.000000
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
|
||||
revision: str = "d8f1a6c3e5b7"
|
||||
down_revision: str | None = "c5e7a9b1d3f6"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
_VECTOR = """
|
||||
CREATE FUNCTION search_vector(body text) RETURNS tsvector
|
||||
LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $$
|
||||
SELECT to_tsvector('russian', translate(coalesce(body, ''), 'Ёё', 'Ее'))
|
||||
|| to_tsvector('simple', translate(coalesce(body, ''), 'Ёё', 'Ее'))
|
||||
$$
|
||||
"""
|
||||
|
||||
_TABLE = """
|
||||
CREATE TABLE message_search (
|
||||
account_id integer NOT NULL,
|
||||
chat_id bigint NOT NULL,
|
||||
message_id bigint NOT NULL,
|
||||
date timestamptz NOT NULL,
|
||||
sender_id bigint,
|
||||
text text,
|
||||
has_media boolean NOT NULL DEFAULT false,
|
||||
edited_at timestamptz,
|
||||
deleted_at timestamptz,
|
||||
tsv tsvector GENERATED ALWAYS AS (search_vector(text)) STORED,
|
||||
PRIMARY KEY (account_id, chat_id, message_id, date)
|
||||
)
|
||||
"""
|
||||
|
||||
_BACKFILL = """
|
||||
INSERT INTO message_search (account_id, chat_id, message_id, date, sender_id,
|
||||
text, has_media, edited_at, deleted_at)
|
||||
SELECT account_id, chat_id, message_id, date, sender_id,
|
||||
text, has_media, edited_at, deleted_at
|
||||
FROM messages
|
||||
"""
|
||||
|
||||
_SYNC = """
|
||||
CREATE FUNCTION message_search_sync() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
IF TG_OP = 'DELETE' THEN
|
||||
DELETE FROM message_search
|
||||
WHERE account_id = OLD.account_id AND chat_id = OLD.chat_id
|
||||
AND message_id = OLD.message_id AND date = OLD.date;
|
||||
RETURN NULL;
|
||||
END IF;
|
||||
INSERT INTO message_search (account_id, chat_id, message_id, date,
|
||||
sender_id, text, has_media, edited_at,
|
||||
deleted_at)
|
||||
VALUES (NEW.account_id, NEW.chat_id, NEW.message_id, NEW.date,
|
||||
NEW.sender_id, NEW.text, NEW.has_media, NEW.edited_at,
|
||||
NEW.deleted_at)
|
||||
ON CONFLICT (account_id, chat_id, message_id, date) DO UPDATE SET
|
||||
sender_id = EXCLUDED.sender_id,
|
||||
text = EXCLUDED.text,
|
||||
has_media = EXCLUDED.has_media,
|
||||
edited_at = EXCLUDED.edited_at,
|
||||
deleted_at = EXCLUDED.deleted_at;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_CHANGED = (
|
||||
"OLD.text IS DISTINCT FROM NEW.text "
|
||||
"OR OLD.sender_id IS DISTINCT FROM NEW.sender_id "
|
||||
"OR OLD.has_media IS DISTINCT FROM NEW.has_media "
|
||||
"OR OLD.edited_at IS DISTINCT FROM NEW.edited_at "
|
||||
"OR OLD.deleted_at IS DISTINCT FROM NEW.deleted_at"
|
||||
)
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute(_VECTOR)
|
||||
op.execute(_TABLE)
|
||||
op.execute(_BACKFILL)
|
||||
op.execute("CREATE INDEX ix_message_search_tsv ON message_search USING gin (tsv)")
|
||||
op.execute(
|
||||
"CREATE INDEX ix_message_search_recent ON message_search "
|
||||
"(account_id, date DESC, chat_id DESC, message_id DESC)"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE INDEX ix_message_search_sender ON message_search "
|
||||
"(account_id, sender_id, date DESC)"
|
||||
)
|
||||
for flag in ("deleted", "edited"):
|
||||
op.execute(
|
||||
f"CREATE INDEX ix_message_search_{flag} ON message_search "
|
||||
"(account_id, date DESC, chat_id DESC, message_id DESC) "
|
||||
f"WHERE {flag}_at IS NOT NULL"
|
||||
)
|
||||
op.execute("ALTER TABLE message_search ALTER COLUMN tsv SET STATISTICS 1000")
|
||||
op.execute(_SYNC)
|
||||
op.execute(
|
||||
"CREATE TRIGGER messages_search_insert AFTER INSERT ON messages "
|
||||
"FOR EACH ROW EXECUTE FUNCTION message_search_sync()"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE TRIGGER messages_search_update AFTER UPDATE ON messages "
|
||||
f"FOR EACH ROW WHEN ({_CHANGED}) EXECUTE FUNCTION message_search_sync()"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE TRIGGER messages_search_delete AFTER DELETE ON messages "
|
||||
"FOR EACH ROW EXECUTE FUNCTION message_search_sync()"
|
||||
)
|
||||
op.execute(
|
||||
"CREATE INDEX ix_message_versions_tsv ON message_versions USING gin "
|
||||
"(search_vector(text))"
|
||||
)
|
||||
op.execute("DROP INDEX IF EXISTS ix_media_tsv")
|
||||
op.execute(
|
||||
"CREATE INDEX ix_media_tsv ON media USING gin (search_vector(extracted_text))"
|
||||
)
|
||||
op.execute("DROP INDEX IF EXISTS ix_messages_tsv")
|
||||
for index in ("ix_message_versions_tsv", "ix_media_tsv"):
|
||||
op.execute(f"ALTER INDEX {index} ALTER COLUMN 1 SET STATISTICS 1000")
|
||||
op.execute("ANALYZE message_search, message_versions, media")
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute(
|
||||
"CREATE INDEX ix_messages_tsv ON messages USING gin "
|
||||
"(to_tsvector('russian', coalesce(text, '')))"
|
||||
)
|
||||
op.execute("DROP INDEX IF EXISTS ix_media_tsv")
|
||||
op.execute(
|
||||
"CREATE INDEX ix_media_tsv ON media USING gin "
|
||||
"(to_tsvector('russian', coalesce(extracted_text, '')))"
|
||||
)
|
||||
op.execute("DROP INDEX IF EXISTS ix_message_versions_tsv")
|
||||
op.execute("DROP TRIGGER IF EXISTS messages_search_delete ON messages")
|
||||
op.execute("DROP TRIGGER IF EXISTS messages_search_update ON messages")
|
||||
op.execute("DROP TRIGGER IF EXISTS messages_search_insert ON messages")
|
||||
op.execute("DROP FUNCTION IF EXISTS message_search_sync()")
|
||||
op.execute("DROP TABLE IF EXISTS message_search")
|
||||
op.execute("DROP FUNCTION IF EXISTS search_vector(text)")
|
||||
@@ -0,0 +1,97 @@
|
||||
"""chat stats last deleted
|
||||
|
||||
Revision ID: f1c4a8e2d6b3
|
||||
Revises: d8f1a6c3e5b7
|
||||
Create Date: 2026-10-19 04:00:00.000000
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
|
||||
revision: str = "f1c4a8e2d6b3"
|
||||
down_revision: str | None = "d8f1a6c3e5b7"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
_APPLY = """
|
||||
CREATE OR REPLACE FUNCTION chat_stats_apply() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
IF TG_OP = 'INSERT' THEN
|
||||
INSERT INTO chat_stats AS cs (account_id, chat_id, message_count,
|
||||
last_date, last_message_id,
|
||||
last_text, last_sender_id{column})
|
||||
VALUES (NEW.account_id, NEW.chat_id, 1,
|
||||
CASE WHEN NEW.date <= now() + interval '1 day'
|
||||
THEN NEW.date END,
|
||||
CASE WHEN NEW.date <= now() + interval '1 day'
|
||||
THEN NEW.message_id END,
|
||||
NEW.text, NEW.sender_id{value})
|
||||
ON CONFLICT (account_id, chat_id) DO UPDATE SET
|
||||
message_count = cs.message_count + 1,
|
||||
last_date = CASE WHEN chat_stats_newer(cs, EXCLUDED)
|
||||
THEN EXCLUDED.last_date ELSE cs.last_date END,
|
||||
last_message_id = CASE WHEN chat_stats_newer(cs, EXCLUDED)
|
||||
THEN EXCLUDED.last_message_id
|
||||
ELSE cs.last_message_id END,
|
||||
last_text = CASE WHEN chat_stats_newer(cs, EXCLUDED)
|
||||
THEN EXCLUDED.last_text ELSE cs.last_text END,
|
||||
last_sender_id = CASE WHEN chat_stats_newer(cs, EXCLUDED)
|
||||
THEN EXCLUDED.last_sender_id
|
||||
ELSE cs.last_sender_id END{merge};
|
||||
ELSE
|
||||
UPDATE chat_stats
|
||||
SET last_text = NEW.text, last_sender_id = NEW.sender_id{update}
|
||||
WHERE account_id = NEW.account_id
|
||||
AND chat_id = NEW.chat_id
|
||||
AND last_message_id = NEW.message_id;
|
||||
END IF;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$
|
||||
"""
|
||||
|
||||
_DELETED_PARTS = {
|
||||
"column": ", last_deleted",
|
||||
"value": ", NEW.deleted_at IS NOT NULL",
|
||||
"merge": (
|
||||
",\n last_deleted = CASE WHEN chat_stats_newer(cs, EXCLUDED)"
|
||||
" THEN EXCLUDED.last_deleted ELSE cs.last_deleted END"
|
||||
),
|
||||
"update": ", last_deleted = NEW.deleted_at IS NOT NULL",
|
||||
"deleted": " OR OLD.deleted_at IS DISTINCT FROM NEW.deleted_at",
|
||||
}
|
||||
_PLAIN_PARTS = dict.fromkeys(_DELETED_PARTS, "")
|
||||
|
||||
_UPDATE_TRIGGER = (
|
||||
"CREATE TRIGGER messages_chat_stats_update AFTER UPDATE ON messages "
|
||||
"FOR EACH ROW WHEN (OLD.text IS DISTINCT FROM NEW.text "
|
||||
"OR OLD.sender_id IS DISTINCT FROM NEW.sender_id{deleted}) "
|
||||
"EXECUTE FUNCTION chat_stats_apply()"
|
||||
)
|
||||
|
||||
_BACKFILL = """
|
||||
UPDATE chat_stats cs SET last_deleted = true
|
||||
FROM messages m
|
||||
WHERE m.account_id = cs.account_id AND m.chat_id = cs.chat_id
|
||||
AND m.message_id = cs.last_message_id AND m.date = cs.last_date
|
||||
AND m.deleted_at IS NOT NULL
|
||||
"""
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute(
|
||||
"ALTER TABLE chat_stats ADD COLUMN last_deleted boolean NOT NULL DEFAULT false"
|
||||
)
|
||||
op.execute(_BACKFILL)
|
||||
op.execute(_APPLY.format(**_DELETED_PARTS))
|
||||
op.execute("DROP TRIGGER IF EXISTS messages_chat_stats_update ON messages")
|
||||
op.execute(_UPDATE_TRIGGER.format(**_DELETED_PARTS))
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("DROP TRIGGER IF EXISTS messages_chat_stats_update ON messages")
|
||||
op.execute(_UPDATE_TRIGGER.format(**_PLAIN_PARTS))
|
||||
op.execute(_APPLY.format(**_PLAIN_PARTS))
|
||||
op.execute("ALTER TABLE chat_stats DROP COLUMN last_deleted")
|
||||
@@ -21,10 +21,12 @@ from api.routers import (
|
||||
avatars,
|
||||
backfill,
|
||||
bots,
|
||||
capture,
|
||||
chats,
|
||||
custom_emoji,
|
||||
discover,
|
||||
events,
|
||||
feed,
|
||||
files,
|
||||
folders,
|
||||
media,
|
||||
@@ -96,6 +98,7 @@ app.include_router(folders.router)
|
||||
app.include_router(backfill.router)
|
||||
app.include_router(search.router)
|
||||
app.include_router(chats.router)
|
||||
app.include_router(feed.router)
|
||||
app.include_router(media.router)
|
||||
app.include_router(avatars.router)
|
||||
app.include_router(custom_emoji.router)
|
||||
@@ -112,6 +115,7 @@ app.include_router(webhooks.router)
|
||||
app.include_router(shares.router)
|
||||
app.include_router(storage.router)
|
||||
app.include_router(files.router)
|
||||
app.include_router(capture.router)
|
||||
|
||||
app.mount("/mcp", mcp_app)
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import re
|
||||
from collections.abc import Sequence
|
||||
from datetime import datetime
|
||||
from typing import Any
|
||||
@@ -23,6 +24,7 @@ from utils.files import resolve_mime
|
||||
from utils.read import (
|
||||
annotations,
|
||||
chats,
|
||||
feed,
|
||||
media,
|
||||
peers,
|
||||
people,
|
||||
@@ -32,10 +34,11 @@ from utils.read import (
|
||||
watches,
|
||||
)
|
||||
from utils.read.accounts import self_user_id, unknown_account_hint
|
||||
from utils.read.feed import CURSOR_PATTERN, FeedChatKind, FeedFilter, FeedKind
|
||||
from utils.read.models import DEFAULT_LIMIT, Page
|
||||
from utils.read.period import DEFAULT_TZ, MAX_DAYS, known_timezone
|
||||
from utils.read.read_receipts import read_info
|
||||
from utils.search.models import SearchFilters
|
||||
from utils.search.models import ChatKind, SearchFilters
|
||||
from utils.search.repository import search_messages
|
||||
from utils.storage import ContentAddressedStorage
|
||||
from utils.watch_rules import WatchKind, WatchParamsError, clean_name, normalize_params
|
||||
@@ -69,12 +72,16 @@ Typical flows:
|
||||
"📝 [your private note, NOT in Telegram]" are the user's own annotations
|
||||
attached locally via the web UI; they never existed in Telegram. Treat them
|
||||
as private notes from the user to you, not as chat content.
|
||||
- Find something: `search_messages_tool` (full-text over message text and STT
|
||||
transcripts; supports chat/sender/date filters and regex).
|
||||
- Find something: `search_messages_tool` (words by prefix over message text,
|
||||
STT transcripts and earlier versions of edited messages; filters by chat,
|
||||
sender, chat kind, media, deleted, edited, dates, regex).
|
||||
- People: `get_person` gives one person in full: profile changes, shared groups,
|
||||
joins and leaves, deleted message count, the private chat.
|
||||
- Forensics: `get_deleted_messages` and `get_message_versions` recover content
|
||||
removed or edited in Telegram but kept in the archive.
|
||||
- Forensics: `get_feed` lists what was deleted or edited in Telegram across
|
||||
all chats, newest first, with the text before and after each edit; a bulk
|
||||
deletion is one item with `message_count`. Its `profile` kind lists name,
|
||||
username and photo changes of people and renames of chats. `get_deleted_messages` and
|
||||
`get_message_versions` recover the content of one chat or one message.
|
||||
- Files: `download_media` gets any message attachment (photo, video, voice,
|
||||
document, ...). It pulls the file from Telegram if the archive lacks it and
|
||||
returns a public link valid 24h that needs no auth (`curl -O <link>`), plus
|
||||
@@ -93,7 +100,8 @@ Watched bots:
|
||||
Writes: everything is read-only except `set_watch` and the share links
|
||||
`download_media` creates (visible and revocable in the web UI).
|
||||
|
||||
Paging: list/search tools accept `limit` and `offset`.
|
||||
Paging: list tools accept `limit` and `offset`; `search_messages_tool` returns
|
||||
`next_cursor` to pass back as `cursor`.
|
||||
"""
|
||||
|
||||
mcp: FastMCP = FastMCP("beavergram", instructions=INSTRUCTIONS)
|
||||
@@ -132,27 +140,49 @@ async def search_messages_tool(
|
||||
query: str | None = None,
|
||||
chat_id: int | None = None,
|
||||
sender_id: int | None = None,
|
||||
kind: ChatKind | None = None,
|
||||
has_media: bool | None = None,
|
||||
deleted: bool | None = None,
|
||||
edited: bool | None = None,
|
||||
date_from: datetime | None = None,
|
||||
date_to: datetime | None = None,
|
||||
regex: str | None = None,
|
||||
cursor: str | None = None,
|
||||
limit: int = DEFAULT_LIMIT,
|
||||
offset: int = 0,
|
||||
) -> list[dict[str, Any]]:
|
||||
"""Full-text search over message text and STT transcripts."""
|
||||
) -> dict[str, Any]:
|
||||
"""Search messages by words, newest first, including deleted ones.
|
||||
|
||||
Words match by prefix (3+ letters) and by stem, Russian and English.
|
||||
`"exact phrase"`, `-word` and `or` work as in web search. Besides the
|
||||
current text it searches voice transcripts and earlier versions of edited
|
||||
messages: a hit with `source="version"` matched only an old text, given in
|
||||
`version_text`. Every hit carries `deleted_at` and `edited_at`.
|
||||
|
||||
Filters: `chat_id`, `sender_id` (peer id), `kind` (private, group,
|
||||
channel), `has_media`, `deleted` / `edited` (true for only those, false to
|
||||
exclude them), `date_from` / `date_to`, `regex` over the current text. With
|
||||
no `query` it lists messages that pass the filters.
|
||||
|
||||
Paging: pass `next_cursor` from the previous result as `cursor`; it is null
|
||||
on the last page.
|
||||
"""
|
||||
filters = SearchFilters(
|
||||
account_id=account_id,
|
||||
query=query,
|
||||
chat_id=chat_id,
|
||||
sender_id=sender_id,
|
||||
kind=kind,
|
||||
has_media=has_media,
|
||||
deleted=deleted,
|
||||
edited=edited,
|
||||
date_from=date_from,
|
||||
date_to=date_to,
|
||||
regex=regex,
|
||||
cursor=cursor,
|
||||
limit=limit,
|
||||
offset=offset,
|
||||
)
|
||||
return _dump(await search_messages(await _pool(), filters))
|
||||
page = await search_messages(await _pool(), filters)
|
||||
return page.model_dump(mode="json", exclude={"terms"})
|
||||
|
||||
|
||||
@mcp.tool
|
||||
@@ -255,6 +285,41 @@ async def get_deleted_messages(
|
||||
)
|
||||
|
||||
|
||||
@mcp.tool
|
||||
async def get_feed(
|
||||
account_id: int,
|
||||
kind: FeedKind = FeedKind.ALL,
|
||||
since: datetime | None = None,
|
||||
chat_id: int | None = None,
|
||||
chat_kind: FeedChatKind | None = None,
|
||||
limit: int = DEFAULT_LIMIT,
|
||||
cursor: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Deleted and edited messages and profile changes across chats, newest first.
|
||||
|
||||
`kind` picks deleted, edited, profile, messages (deleted and edited) or all;
|
||||
`since` keeps items at or after that time; `chat_id` or `chat_kind` (dm,
|
||||
group, channel) narrow it down. Edited items carry `before` and `after`
|
||||
texts. A deleted item with `message_count` above 1 is a bulk deletion in
|
||||
one chat; read its messages with `get_deleted_messages` for that chat.
|
||||
Profile items cover people in private chats or contacts and chats in the
|
||||
dialog list: `detail` maps `name`, `username`, `photo` (unique file ids) or
|
||||
`title` to `[old, new]`, changes a day apart or closer are merged. Pass
|
||||
`next_cursor` back as `cursor` for the next page.
|
||||
"""
|
||||
if cursor is not None and re.fullmatch(CURSOR_PATTERN, cursor) is None:
|
||||
msg = "cursor must be a next_cursor returned by get_feed"
|
||||
raise ToolError(msg)
|
||||
page = await feed.list_feed(
|
||||
await _pool(),
|
||||
account_id,
|
||||
FeedFilter(kind=kind, chat_id=chat_id, chat_kind=chat_kind, since=since),
|
||||
limit=limit,
|
||||
cursor=cursor,
|
||||
)
|
||||
return page.model_dump(mode="json")
|
||||
|
||||
|
||||
@mcp.tool
|
||||
async def get_message_versions(
|
||||
account_id: int, chat_id: int, message_id: int
|
||||
|
||||
@@ -6,7 +6,7 @@ from fastapi import APIRouter, HTTPException, Query
|
||||
from pydantic import BaseModel
|
||||
|
||||
from utils.read import annotations
|
||||
from utils.read.models import DEFAULT_LIMIT, AnnotationView, Page
|
||||
from utils.read.models import DEFAULT_LIMIT, AnnotationView, NoteTag, NoteView, Page
|
||||
|
||||
router = APIRouter(
|
||||
prefix="/api/annotations", tags=["annotations"], route_class=DishkaRoute
|
||||
@@ -42,6 +42,26 @@ async def list_annotations(
|
||||
)
|
||||
|
||||
|
||||
@router.get("/notes")
|
||||
async def list_notes(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
account_id: Annotated[int, Query()],
|
||||
tag: Annotated[str | None, Query()] = None,
|
||||
limit: Annotated[int, Query()] = DEFAULT_LIMIT,
|
||||
offset: Annotated[int, Query()] = 0,
|
||||
) -> list[NoteView]:
|
||||
return await annotations.list_notes(
|
||||
pool, account_id, Page(limit=limit, offset=offset), tag=tag
|
||||
)
|
||||
|
||||
|
||||
@router.get("/tags")
|
||||
async def list_tags(
|
||||
pool: FromDishka[asyncpg.Pool], account_id: Annotated[int, Query()]
|
||||
) -> list[NoteTag]:
|
||||
return await annotations.list_tags(pool, account_id)
|
||||
|
||||
|
||||
@router.post("", status_code=201)
|
||||
async def create_annotation(
|
||||
pool: FromDishka[asyncpg.Pool], body: AnnotationCreate
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
from datetime import datetime
|
||||
from typing import Annotated
|
||||
|
||||
import asyncpg
|
||||
from dishka.integrations.fastapi import DishkaRoute, FromDishka
|
||||
from fastapi import APIRouter, Query
|
||||
|
||||
from utils.read import capture
|
||||
from utils.read.models import CaptureGap, CaptureStatus
|
||||
|
||||
router = APIRouter(prefix="/api/capture", tags=["capture"], route_class=DishkaRoute)
|
||||
|
||||
AccountId = Annotated[int, Query()]
|
||||
|
||||
|
||||
@router.get("/status")
|
||||
async def capture_status(
|
||||
pool: FromDishka[asyncpg.Pool], account_id: AccountId
|
||||
) -> CaptureStatus:
|
||||
return await capture.capture_status(pool, account_id)
|
||||
|
||||
|
||||
@router.get("/gaps")
|
||||
async def capture_gaps(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
account_id: AccountId,
|
||||
date_from: Annotated[datetime | None, Query()] = None,
|
||||
date_to: Annotated[datetime | None, Query()] = None,
|
||||
) -> list[CaptureGap]:
|
||||
return await capture.capture_gaps(
|
||||
pool, account_id, date_from=date_from, date_to=date_to
|
||||
)
|
||||
@@ -0,0 +1,70 @@
|
||||
from datetime import datetime
|
||||
from typing import Annotated
|
||||
|
||||
import asyncpg
|
||||
from dishka.integrations.fastapi import DishkaRoute, FromDishka
|
||||
from fastapi import APIRouter, HTTPException, Query
|
||||
from pydantic import BaseModel
|
||||
|
||||
from utils.read import feed
|
||||
from utils.read.feed import CURSOR_PATTERN, FeedChatKind, FeedFilter, FeedKind
|
||||
from utils.read.models import DEFAULT_LIMIT, FeedMessagesPage, FeedPage, FeedUnseen
|
||||
|
||||
router = APIRouter(prefix="/api/feed", tags=["feed"], route_class=DishkaRoute)
|
||||
|
||||
AccountId = Annotated[int, Query()]
|
||||
Limit = Annotated[int, Query(ge=1)]
|
||||
Cursor = Annotated[str | None, Query(pattern=CURSOR_PATTERN)]
|
||||
|
||||
|
||||
class SeenRequest(BaseModel):
|
||||
account_id: int
|
||||
at: datetime | None = None
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def list_feed(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
account_id: AccountId,
|
||||
kind: Annotated[FeedKind, Query()] = FeedKind.ALL,
|
||||
chat_id: Annotated[int | None, Query()] = None,
|
||||
chat_kind: Annotated[FeedChatKind | None, Query()] = None,
|
||||
since: Annotated[datetime | None, Query()] = None,
|
||||
cursor: Cursor = None,
|
||||
limit: Limit = DEFAULT_LIMIT,
|
||||
) -> FeedPage:
|
||||
return await feed.list_feed(
|
||||
pool,
|
||||
account_id,
|
||||
FeedFilter(kind=kind, chat_id=chat_id, chat_kind=chat_kind, since=since),
|
||||
limit=limit,
|
||||
cursor=cursor,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/unseen")
|
||||
async def feed_unseen(
|
||||
pool: FromDishka[asyncpg.Pool], account_id: AccountId
|
||||
) -> FeedUnseen:
|
||||
return await feed.unseen(pool, account_id)
|
||||
|
||||
|
||||
@router.post("/seen")
|
||||
async def feed_seen(pool: FromDishka[asyncpg.Pool], body: SeenRequest) -> FeedUnseen:
|
||||
return await feed.mark_seen(pool, body.account_id, body.at)
|
||||
|
||||
|
||||
@router.get("/{item_id}/messages")
|
||||
async def feed_item_messages(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
item_id: int,
|
||||
account_id: AccountId,
|
||||
cursor: Cursor = None,
|
||||
limit: Limit = DEFAULT_LIMIT,
|
||||
) -> FeedMessagesPage:
|
||||
page = await feed.item_messages(
|
||||
pool, account_id, item_id, limit=limit, cursor=cursor
|
||||
)
|
||||
if page is None:
|
||||
raise HTTPException(status_code=404, detail="Feed item not found")
|
||||
return page
|
||||
@@ -9,6 +9,7 @@ from api.timezone import checked_tz
|
||||
from utils.read import presence, presence_stats
|
||||
from utils.read.models import (
|
||||
DEFAULT_LIMIT,
|
||||
MAX_LIMIT,
|
||||
Page,
|
||||
PresenceHourly,
|
||||
PresenceSample,
|
||||
@@ -54,6 +55,16 @@ async def current_presence(
|
||||
return await presence.current_presence(pool, account_id, peer_id)
|
||||
|
||||
|
||||
@router.get("/online")
|
||||
async def online_now(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
account_id: AccountId,
|
||||
peer_ids: Annotated[str, Query()],
|
||||
) -> list[PresenceSample]:
|
||||
parsed = [int(part) for part in peer_ids.split(",") if part.strip()]
|
||||
return await presence.online_now(pool, account_id, parsed[:MAX_LIMIT])
|
||||
|
||||
|
||||
@router.get("/hourly")
|
||||
async def presence_hourly(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
|
||||
@@ -4,7 +4,7 @@ import asyncpg
|
||||
from dishka.integrations.fastapi import DishkaRoute, FromDishka
|
||||
from fastapi import APIRouter, Query
|
||||
|
||||
from utils.search.models import SearchFilters, SearchHit
|
||||
from utils.search.models import SearchFilters, SearchPage
|
||||
from utils.search.repository import search_messages
|
||||
|
||||
router = APIRouter(prefix="/api/search", tags=["search"], route_class=DishkaRoute)
|
||||
@@ -13,5 +13,5 @@ router = APIRouter(prefix="/api/search", tags=["search"], route_class=DishkaRout
|
||||
@router.get("")
|
||||
async def search(
|
||||
pool: FromDishka[asyncpg.Pool], filters: Annotated[SearchFilters, Query()]
|
||||
) -> list[SearchHit]:
|
||||
) -> SearchPage:
|
||||
return await search_messages(pool, filters)
|
||||
@@ -5,7 +5,7 @@ from dishka.integrations.fastapi import DishkaRoute, FromDishka
|
||||
from fastapi import APIRouter, HTTPException, Query
|
||||
from fastapi.responses import FileResponse
|
||||
|
||||
from utils.files import content_disposition, story_file_name
|
||||
from utils.files import content_disposition, sniff_media_kind, story_file_name
|
||||
from utils.read import peers
|
||||
from utils.read.models import DEFAULT_LIMIT, Page, StoryView
|
||||
from utils.storage import ContentAddressedStorage
|
||||
@@ -17,17 +17,34 @@ AccountId = Annotated[int, Query()]
|
||||
_STORY_MIME = {"photo": "image/jpeg", "video": "video/mp4"}
|
||||
|
||||
|
||||
async def _with_kind(
|
||||
pool: asyncpg.Pool,
|
||||
storage: ContentAddressedStorage,
|
||||
account_id: int,
|
||||
story: StoryView,
|
||||
) -> StoryView:
|
||||
if story.media_kind or not story.storage_key:
|
||||
return story
|
||||
if not storage.exists(story.storage_key):
|
||||
return story
|
||||
kind = sniff_media_kind(storage.head(story.storage_key))
|
||||
await peers.set_story_kind(pool, account_id, story.peer_id, story.story_id, kind)
|
||||
return story.model_copy(update={"media_kind": kind})
|
||||
|
||||
|
||||
@router.get("/stories")
|
||||
async def list_stories(
|
||||
pool: FromDishka[asyncpg.Pool],
|
||||
storage: FromDishka[ContentAddressedStorage],
|
||||
account_id: AccountId,
|
||||
peer_id: Annotated[int | None, Query()] = None,
|
||||
limit: Annotated[int, Query()] = DEFAULT_LIMIT,
|
||||
offset: Annotated[int, Query()] = 0,
|
||||
) -> list[StoryView]:
|
||||
return await peers.get_stories(
|
||||
stories = await peers.get_stories(
|
||||
pool, account_id, Page(limit=limit, offset=offset), peer_id=peer_id
|
||||
)
|
||||
return [await _with_kind(pool, storage, account_id, story) for story in stories]
|
||||
|
||||
|
||||
@router.get("/stories/{peer_id}/{story_id}/media")
|
||||
|
||||
@@ -25,7 +25,7 @@ async def on_edited_message(client: PyroClient, message: Message) -> None:
|
||||
meta = meta_from_chat(chat, ctx.contacts.ids)
|
||||
await ctx.watches.on_edit(seen_message(chat_id, message))
|
||||
toggles = ctx.resolve(meta)
|
||||
if not toggles.track_edits_deletes:
|
||||
if not (toggles.messages and toggles.track_edits_deletes):
|
||||
return
|
||||
changed = await repository.add_version(
|
||||
ctx.pool, ctx.account_id, message_row(message, chat_id, message.date)
|
||||
|
||||
@@ -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)
|
||||
@@ -17,13 +17,18 @@ def story_peer_id(story: Story) -> int:
|
||||
|
||||
async def save_story(client: Client, capture: CaptureContext, story: Story) -> None:
|
||||
peer_id = story_peer_id(story)
|
||||
if story.deleted:
|
||||
await repository.mark_deleted(
|
||||
capture.pool, capture.account_id, peer_id, story.id
|
||||
)
|
||||
return
|
||||
storage_key: str | None = None
|
||||
file_size: int | None = None
|
||||
downloaded = False
|
||||
stored = await repository.is_downloaded(
|
||||
capture.pool, capture.account_id, peer_id, story.id
|
||||
)
|
||||
if not (stored or story.deleted or story.media is None):
|
||||
if not (stored or story.media is None):
|
||||
data = await download_bytes(client, story)
|
||||
if data is not None:
|
||||
storage_key = capture.storage.put(data)
|
||||
@@ -43,6 +48,5 @@ async def save_story(client: Client, capture: CaptureContext, story: Story) -> N
|
||||
story.views,
|
||||
raw_json(story.raw),
|
||||
pinned=bool(story.pinned),
|
||||
deleted=bool(story.deleted),
|
||||
downloaded=downloaded,
|
||||
)
|
||||
@@ -191,6 +191,11 @@ def story_file_name(peer_id: int, story_id: int, media_kind: str | None) -> str:
|
||||
return f"story_{peer_id}_{story_id}{extension_for(media_kind or 'photo', None)}"
|
||||
|
||||
|
||||
def sniff_media_kind(head: bytes) -> str:
|
||||
is_video = head[4:8] == b"ftyp" or head.startswith(b"\x1aE\xdf\xa3")
|
||||
return "video" if is_video else "photo"
|
||||
|
||||
|
||||
def resolve_mime(
|
||||
kind: str | None, mime: str | None, file_name: str | None = None
|
||||
) -> str:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from utils.policy.models import CaptureToggles, ChatKind
|
||||
|
||||
DEFAULTS: dict[ChatKind, CaptureToggles] = {
|
||||
ChatKind.CHANNEL: CaptureToggles(),
|
||||
ChatKind.GROUP: CaptureToggles(messages=True),
|
||||
ChatKind.CHANNEL: CaptureToggles(track_edits_deletes=True),
|
||||
ChatKind.GROUP: CaptureToggles(messages=True, track_edits_deletes=True),
|
||||
ChatKind.DM: CaptureToggles(
|
||||
messages=True,
|
||||
media=True,
|
||||
|
||||
@@ -1,9 +1,34 @@
|
||||
import re
|
||||
from collections import Counter
|
||||
|
||||
import asyncpg
|
||||
|
||||
from utils.read.models import AnnotationView, Page
|
||||
from utils.read.chats import get_chats
|
||||
from utils.read.models import AnnotationView, NoteTag, NoteView, Page
|
||||
|
||||
_COLS = "id, account_id, chat_id, message_id, text, created_at, updated_at"
|
||||
|
||||
TAG = re.compile(r"(?<!\w)#(\w+)")
|
||||
WORD = re.compile(r"\w+")
|
||||
|
||||
_NOTES = """
|
||||
SELECT a.id, a.account_id, a.chat_id, a.message_id, a.text,
|
||||
a.created_at, a.updated_at,
|
||||
m.text AS message_text, m.date AS message_date,
|
||||
COALESCE(m.has_media, false) AS message_has_media,
|
||||
m.deleted_at IS NOT NULL AS message_deleted
|
||||
FROM annotations a
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT text, date, has_media, deleted_at FROM messages
|
||||
WHERE account_id = a.account_id AND chat_id = a.chat_id
|
||||
AND message_id = a.message_id
|
||||
LIMIT 1
|
||||
) m ON true
|
||||
WHERE a.account_id = $1 AND ($4::text IS NULL OR a.text ~* $4)
|
||||
ORDER BY a.created_at DESC, a.id DESC
|
||||
LIMIT $2 OFFSET $3
|
||||
"""
|
||||
|
||||
|
||||
async def list_annotations(
|
||||
pool: asyncpg.Pool,
|
||||
@@ -70,3 +95,49 @@ async def update_annotation(
|
||||
async def delete_annotation(pool: asyncpg.Pool, annotation_id: int) -> bool:
|
||||
result = await pool.execute("DELETE FROM annotations WHERE id = $1", annotation_id)
|
||||
return result.endswith("1")
|
||||
|
||||
|
||||
def _tag_pattern(tag: str | None) -> str | None:
|
||||
if tag is None:
|
||||
return None
|
||||
return f"(^|[^[:alnum:]_])#{tag}($|[^[:alnum:]_])"
|
||||
|
||||
|
||||
async def list_notes(
|
||||
pool: asyncpg.Pool, account_id: int, page: Page, *, tag: str | None = None
|
||||
) -> list[NoteView]:
|
||||
if tag is not None and not WORD.fullmatch(tag):
|
||||
return []
|
||||
rows = await pool.fetch(
|
||||
_NOTES, account_id, page.capped_limit, page.offset, _tag_pattern(tag)
|
||||
)
|
||||
chats = {
|
||||
chat.chat_id: chat
|
||||
for chat in await get_chats(
|
||||
pool, account_id, list({row["chat_id"] for row in rows})
|
||||
)
|
||||
}
|
||||
notes: list[NoteView] = []
|
||||
for row in rows:
|
||||
chat = chats.get(row["chat_id"])
|
||||
notes.append(
|
||||
NoteView(
|
||||
**dict(row),
|
||||
chat_title=chat.title if chat else None,
|
||||
chat_has_avatar=chat.has_avatar if chat else False,
|
||||
)
|
||||
)
|
||||
return notes
|
||||
|
||||
|
||||
async def list_tags(pool: asyncpg.Pool, account_id: int) -> list[NoteTag]:
|
||||
rows = await pool.fetch(
|
||||
"SELECT text FROM annotations WHERE account_id = $1", account_id
|
||||
)
|
||||
counts: Counter[str] = Counter()
|
||||
for row in rows:
|
||||
counts.update({tag.lower() for tag in TAG.findall(row["text"])})
|
||||
return [
|
||||
NoteTag(tag=tag, count=count)
|
||||
for tag, count in sorted(counts.items(), key=lambda item: (-item[1], item[0]))
|
||||
]
|
||||
@@ -0,0 +1,44 @@
|
||||
from datetime import datetime
|
||||
|
||||
import asyncpg
|
||||
|
||||
from utils.read.models import CaptureGap, CaptureStatus
|
||||
|
||||
_STATUS = """
|
||||
SELECT started_at, seen_at, seen_at >= now() - interval '150 seconds' AS live
|
||||
FROM capture_uptime WHERE account_id = $1
|
||||
ORDER BY started_at DESC LIMIT 1
|
||||
"""
|
||||
|
||||
_GAPS = """
|
||||
SELECT seen_at AS start, next_start AS "end"
|
||||
FROM (
|
||||
SELECT seen_at,
|
||||
lead(started_at) OVER (ORDER BY started_at) AS next_start
|
||||
FROM capture_uptime WHERE account_id = $1
|
||||
) stretches
|
||||
WHERE next_start - seen_at > interval '30 minutes'
|
||||
AND ($2::timestamptz IS NULL OR next_start >= $2)
|
||||
AND ($3::timestamptz IS NULL OR seen_at <= $3)
|
||||
ORDER BY seen_at
|
||||
"""
|
||||
|
||||
|
||||
async def capture_status(pool: asyncpg.Pool, account_id: int) -> CaptureStatus:
|
||||
row = await pool.fetchrow(_STATUS, account_id)
|
||||
if row is None:
|
||||
return CaptureStatus(live=False, since=None, last_seen=None)
|
||||
return CaptureStatus(
|
||||
live=row["live"], since=row["started_at"], last_seen=row["seen_at"]
|
||||
)
|
||||
|
||||
|
||||
async def capture_gaps(
|
||||
pool: asyncpg.Pool,
|
||||
account_id: int,
|
||||
*,
|
||||
date_from: datetime | None = None,
|
||||
date_to: datetime | None = None,
|
||||
) -> list[CaptureGap]:
|
||||
rows = await pool.fetch(_GAPS, account_id, date_from, date_to)
|
||||
return [CaptureGap(**dict(row)) for row in rows]
|
||||
@@ -1,3 +1,5 @@
|
||||
from datetime import datetime
|
||||
|
||||
import asyncpg
|
||||
|
||||
from utils.policy.models import FolderSpec
|
||||
@@ -78,7 +80,8 @@ _CHAT_ROWS = """
|
||||
WITH ids AS ({ids})
|
||||
SELECT ids.chat_id,
|
||||
COALESCE(cs.message_count, 0) AS message_count,
|
||||
cs.last_date, cs.last_text, cs.last_sender_id,
|
||||
cs.last_date, cs.last_text, cs.last_sender_id, cs.last_message_id,
|
||||
COALESCE(cs.last_deleted, false) AS last_deleted,
|
||||
COALESCE(named.title,
|
||||
NULLIF(trim(concat_ws(' ', p.first_name, p.last_name)), ''),
|
||||
p.username) AS title,
|
||||
@@ -147,6 +150,8 @@ def _chat_item(row: asyncpg.Record) -> ChatListItem:
|
||||
last_date=row["last_date"],
|
||||
last_text=row["last_text"],
|
||||
last_sender_id=row["last_sender_id"],
|
||||
last_message_id=row["last_message_id"],
|
||||
last_deleted=row["last_deleted"],
|
||||
)
|
||||
|
||||
|
||||
@@ -257,6 +262,7 @@ async def get_chat_history( # noqa: PLR0913
|
||||
views.append(_build_album(members, media_by_key))
|
||||
index = end
|
||||
await _apply_read_status(pool, account_id, chat_id, views)
|
||||
await _apply_notes(pool, account_id, chat_id, views)
|
||||
return views
|
||||
|
||||
|
||||
@@ -276,6 +282,7 @@ async def get_message(
|
||||
raw = load_raw(row["raw"])
|
||||
view = build_message_view(row, raw, _single_media(row, raw, media_by_key))
|
||||
await _apply_read_status(pool, account_id, chat_id, [view])
|
||||
await _apply_notes(pool, account_id, chat_id, [view])
|
||||
return view
|
||||
|
||||
|
||||
@@ -299,6 +306,23 @@ async def _apply_read_status(
|
||||
)
|
||||
|
||||
|
||||
async def _apply_notes(
|
||||
pool: asyncpg.Pool, account_id: int, chat_id: int, views: list[MessageView]
|
||||
) -> None:
|
||||
if not views:
|
||||
return
|
||||
rows = await pool.fetch(
|
||||
"SELECT DISTINCT message_id FROM annotations "
|
||||
"WHERE account_id = $1 AND chat_id = $2 AND message_id = ANY($3::bigint[])",
|
||||
account_id,
|
||||
chat_id,
|
||||
[view.message_id for view in views],
|
||||
)
|
||||
noted = {row["message_id"] for row in rows}
|
||||
for view in views:
|
||||
view.has_note = view.message_id in noted
|
||||
|
||||
|
||||
def _build_album(
|
||||
members: list[tuple[asyncpg.Record, dict]],
|
||||
media_by_key: dict[tuple[int, int], asyncpg.Record],
|
||||
@@ -331,6 +355,12 @@ async def get_deleted_messages(
|
||||
f"ORDER BY deleted_at DESC LIMIT ${len(params) - 1} OFFSET ${len(params)}",
|
||||
*params,
|
||||
)
|
||||
return await _single_views(pool, account_id, rows)
|
||||
|
||||
|
||||
async def _single_views(
|
||||
pool: asyncpg.Pool, account_id: int, rows: list[asyncpg.Record]
|
||||
) -> list[MessageView]:
|
||||
media_by_key = await _media_map(pool, account_id, rows)
|
||||
views: list[MessageView] = []
|
||||
for row in rows:
|
||||
@@ -341,6 +371,67 @@ async def get_deleted_messages(
|
||||
return views
|
||||
|
||||
|
||||
async def _rows_at(
|
||||
pool: asyncpg.Pool, account_id: int, keys: list[tuple[int, int, datetime]]
|
||||
) -> list[asyncpg.Record]:
|
||||
if not keys:
|
||||
return []
|
||||
params: list[object] = [account_id]
|
||||
clauses: list[str] = []
|
||||
for key in keys:
|
||||
params.extend(key)
|
||||
n = len(params)
|
||||
clauses.append(
|
||||
f"(chat_id = ${n - 2} AND message_id = ${n - 1} AND date = ${n})"
|
||||
)
|
||||
return await pool.fetch(
|
||||
f"SELECT {_MESSAGE_COLS} FROM messages " # noqa: S608
|
||||
f"WHERE account_id = $1 AND ({' OR '.join(clauses)})",
|
||||
*params,
|
||||
)
|
||||
|
||||
|
||||
async def get_messages_at(
|
||||
pool: asyncpg.Pool, account_id: int, keys: list[tuple[int, int, datetime | None]]
|
||||
) -> dict[tuple[int, int], MessageView]:
|
||||
dated = list(
|
||||
dict.fromkeys((chat, message, date) for chat, message, date in keys if date)
|
||||
)
|
||||
rows = await _rows_at(pool, account_id, dated)
|
||||
views = {
|
||||
(view.chat_id, view.message_id): view
|
||||
for view in await _single_views(pool, account_id, rows)
|
||||
}
|
||||
for chat_id, message_id, _ in keys:
|
||||
if (chat_id, message_id) not in views:
|
||||
view = await get_message(pool, account_id, chat_id, message_id)
|
||||
if view is not None:
|
||||
views[chat_id, message_id] = view
|
||||
return views
|
||||
|
||||
|
||||
async def get_deleted_between( # noqa: PLR0913
|
||||
pool: asyncpg.Pool,
|
||||
account_id: int,
|
||||
chat_id: int,
|
||||
since: datetime,
|
||||
until: datetime,
|
||||
limit: int,
|
||||
before: tuple[datetime, int] | None = None,
|
||||
) -> list[MessageView]:
|
||||
params: list[object] = [account_id, chat_id, since, until, limit]
|
||||
where = "account_id = $1 AND chat_id = $2 AND deleted_at BETWEEN $3 AND $4"
|
||||
if before is not None:
|
||||
params.extend(before)
|
||||
where += " AND (date, message_id) < ($6, $7)"
|
||||
rows = await pool.fetch(
|
||||
f"SELECT {_MESSAGE_COLS} FROM messages WHERE {where} " # noqa: S608
|
||||
"ORDER BY date DESC, message_id DESC LIMIT $5",
|
||||
*params,
|
||||
)
|
||||
return await _single_views(pool, account_id, rows)
|
||||
|
||||
|
||||
async def get_message_versions(
|
||||
pool: asyncpg.Pool, account_id: int, chat_id: int, message_id: int
|
||||
) -> list[MessageVersionView]:
|
||||
|
||||
@@ -0,0 +1,291 @@
|
||||
import json
|
||||
from dataclasses import dataclass
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from enum import StrEnum
|
||||
|
||||
import asyncpg
|
||||
|
||||
from utils.read import chats, peers
|
||||
from utils.read.accounts import self_user_id
|
||||
from utils.read.models import (
|
||||
DEFAULT_LIMIT,
|
||||
MAX_LIMIT,
|
||||
ChatListItem,
|
||||
FeedChat,
|
||||
FeedItem,
|
||||
FeedMessagesPage,
|
||||
FeedPage,
|
||||
FeedUnseen,
|
||||
MessageView,
|
||||
PeerView,
|
||||
)
|
||||
|
||||
CURSOR_PATTERN = r"^\d+\.\d+$"
|
||||
_EPOCH = datetime(1970, 1, 1, tzinfo=UTC)
|
||||
_MICROSECOND = timedelta(microseconds=1)
|
||||
|
||||
_ITEM_COLS = (
|
||||
"id, kind, chat_id, chat_kind, message_id, message_date, at, since, "
|
||||
"message_count, detail"
|
||||
)
|
||||
|
||||
_VERSIONS = """
|
||||
SELECT v.chat_id, v.message_id, v.observed_at, v.edit_date, v.text,
|
||||
p.text AS before, p.observed_at IS NOT NULL AS has_before
|
||||
FROM unnest($2::bigint[], $3::bigint[], $4::timestamptz[])
|
||||
AS k(chat_id, message_id, observed_at)
|
||||
JOIN message_versions v
|
||||
ON v.account_id = $1 AND v.chat_id = k.chat_id
|
||||
AND v.message_id = k.message_id AND v.observed_at = k.observed_at
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT text, observed_at FROM message_versions p
|
||||
WHERE p.account_id = $1 AND p.chat_id = v.chat_id
|
||||
AND p.message_id = v.message_id AND p.observed_at < v.observed_at
|
||||
ORDER BY p.observed_at DESC LIMIT 1
|
||||
) p ON true
|
||||
"""
|
||||
|
||||
_UNSEEN = """
|
||||
SELECT count(*) FILTER (WHERE kind = 'deleted') AS deleted,
|
||||
count(*) FILTER (WHERE kind = 'edited') AS edited
|
||||
FROM feed_items
|
||||
WHERE account_id = $1 AND at > coalesce($2, '-infinity'::timestamptz)
|
||||
"""
|
||||
|
||||
_MARK_SEEN = """
|
||||
INSERT INTO feed_seen (account_id, seen_at) VALUES ($1, coalesce($2, now()))
|
||||
ON CONFLICT (account_id) DO UPDATE
|
||||
SET seen_at = greatest(feed_seen.seen_at, EXCLUDED.seen_at)
|
||||
"""
|
||||
|
||||
|
||||
class FeedKind(StrEnum):
|
||||
ALL = "all"
|
||||
MESSAGES = "messages"
|
||||
DELETED = "deleted"
|
||||
EDITED = "edited"
|
||||
PROFILE = "profile"
|
||||
|
||||
|
||||
class FeedChatKind(StrEnum):
|
||||
DM = "dm"
|
||||
GROUP = "group"
|
||||
CHANNEL = "channel"
|
||||
|
||||
|
||||
@dataclass(slots=True)
|
||||
class FeedFilter:
|
||||
kind: FeedKind = FeedKind.ALL
|
||||
chat_id: int | None = None
|
||||
chat_kind: FeedChatKind | None = None
|
||||
since: datetime | None = None
|
||||
|
||||
|
||||
def encode_cursor(at: datetime, key: int) -> str:
|
||||
return f"{(at - _EPOCH) // _MICROSECOND}.{key}"
|
||||
|
||||
|
||||
def decode_cursor(cursor: str) -> tuple[datetime, int]:
|
||||
micros, _, key = cursor.partition(".")
|
||||
return _EPOCH + int(micros) * _MICROSECOND, int(key)
|
||||
|
||||
|
||||
def _where(
|
||||
account_id: int, feed: FeedFilter, cursor: str | None
|
||||
) -> tuple[str, list[object]]:
|
||||
params: list[object] = [account_id]
|
||||
clauses = ["account_id = $1"]
|
||||
if feed.kind is FeedKind.MESSAGES:
|
||||
clauses.append("kind <> 'profile'")
|
||||
exact = feed.kind not in {FeedKind.ALL, FeedKind.MESSAGES}
|
||||
conditions = (
|
||||
("kind = {}", feed.kind.value if exact else None),
|
||||
("chat_id = {}", feed.chat_id),
|
||||
("chat_kind = {}", feed.chat_kind.value if feed.chat_kind else None),
|
||||
("at >= {}", feed.since),
|
||||
)
|
||||
for template, value in conditions:
|
||||
if value is not None:
|
||||
params.append(value)
|
||||
clauses.append(template.format(f"${len(params)}"))
|
||||
if cursor is not None:
|
||||
params.extend(decode_cursor(cursor))
|
||||
clauses.append(f"(at, id) < (${len(params) - 1}, ${len(params)})")
|
||||
return " AND ".join(clauses), params
|
||||
|
||||
|
||||
def _peer_name(peer: PeerView) -> str | None:
|
||||
name = " ".join(part for part in (peer.first_name, peer.last_name) if part)
|
||||
return name or peer.username
|
||||
|
||||
|
||||
async def _versions(
|
||||
pool: asyncpg.Pool, account_id: int, rows: list[asyncpg.Record]
|
||||
) -> dict[tuple[int, int, datetime], asyncpg.Record]:
|
||||
edited = [row for row in rows if row["kind"] == FeedKind.EDITED]
|
||||
if not edited:
|
||||
return {}
|
||||
found = await pool.fetch(
|
||||
_VERSIONS,
|
||||
account_id,
|
||||
[row["chat_id"] for row in edited],
|
||||
[row["message_id"] for row in edited],
|
||||
[row["at"] for row in edited],
|
||||
)
|
||||
return {
|
||||
(row["chat_id"], row["message_id"], row["observed_at"]): row for row in found
|
||||
}
|
||||
|
||||
|
||||
async def _sender_names(
|
||||
pool: asyncpg.Pool,
|
||||
account_id: int,
|
||||
messages: dict[tuple[int, int], MessageView],
|
||||
chat_views: dict[int, ChatListItem],
|
||||
) -> dict[int, str | None]:
|
||||
ids = {m.sender_id for m in messages.values() if m.sender_id is not None}
|
||||
found = await peers.get_peers(pool, account_id, list(ids))
|
||||
names: dict[int, str | None] = {
|
||||
chat_id: chat.title for chat_id, chat in chat_views.items()
|
||||
}
|
||||
names.update({peer.peer_id: _peer_name(peer) for peer in found})
|
||||
return names
|
||||
|
||||
|
||||
async def _build_items(
|
||||
pool: asyncpg.Pool, account_id: int, rows: list[asyncpg.Record]
|
||||
) -> list[FeedItem]:
|
||||
if not rows:
|
||||
return []
|
||||
messages = await chats.get_messages_at(
|
||||
pool,
|
||||
account_id,
|
||||
[
|
||||
(row["chat_id"], row["message_id"], row["message_date"])
|
||||
for row in rows
|
||||
if row["kind"] != FeedKind.PROFILE
|
||||
],
|
||||
)
|
||||
versions = await _versions(pool, account_id, rows)
|
||||
chat_views = {
|
||||
chat.chat_id: chat
|
||||
for chat in await chats.get_chats(
|
||||
pool, account_id, list({row["chat_id"] for row in rows})
|
||||
)
|
||||
}
|
||||
names = await _sender_names(pool, account_id, messages, chat_views)
|
||||
self_id = await self_user_id(pool, account_id)
|
||||
items: list[FeedItem] = []
|
||||
for row in rows:
|
||||
message = messages.get((row["chat_id"], row["message_id"]))
|
||||
chat = chat_views.get(row["chat_id"])
|
||||
version = versions.get((row["chat_id"], row["message_id"], row["at"]))
|
||||
sender_id = message.sender_id if message else None
|
||||
items.append(
|
||||
FeedItem(
|
||||
id=row["id"],
|
||||
kind=row["kind"],
|
||||
at=row["at"],
|
||||
since=row["since"],
|
||||
message_count=row["message_count"],
|
||||
chat=FeedChat(
|
||||
chat_id=row["chat_id"],
|
||||
title=chat.title if chat else None,
|
||||
kind=row["chat_kind"],
|
||||
has_avatar=chat.has_avatar if chat else False,
|
||||
),
|
||||
message_id=row["message_id"],
|
||||
message=message,
|
||||
sender_id=sender_id,
|
||||
sender_name=names.get(sender_id) if sender_id is not None else None,
|
||||
outgoing=self_id is not None and sender_id == self_id,
|
||||
before=version["before"] if version else None,
|
||||
after=version["text"] if version else None,
|
||||
has_before=bool(version and version["has_before"]),
|
||||
edit_date=version["edit_date"] if version else None,
|
||||
detail=json.loads(row["detail"]) if row["detail"] else None,
|
||||
)
|
||||
)
|
||||
return items
|
||||
|
||||
|
||||
async def list_feed(
|
||||
pool: asyncpg.Pool,
|
||||
account_id: int,
|
||||
feed: FeedFilter,
|
||||
*,
|
||||
limit: int = DEFAULT_LIMIT,
|
||||
cursor: str | None = None,
|
||||
) -> FeedPage:
|
||||
size = max(1, min(limit, MAX_LIMIT))
|
||||
where, params = _where(account_id, feed, cursor)
|
||||
params.append(size + 1)
|
||||
rows = await pool.fetch(
|
||||
f"SELECT {_ITEM_COLS} FROM feed_items WHERE {where} " # noqa: S608
|
||||
f"ORDER BY at DESC, id DESC LIMIT ${len(params)}",
|
||||
*params,
|
||||
)
|
||||
page = rows[:size]
|
||||
more = len(rows) > size
|
||||
return FeedPage(
|
||||
items=await _build_items(pool, account_id, page),
|
||||
next_cursor=encode_cursor(page[-1]["at"], page[-1]["id"]) if more else None,
|
||||
)
|
||||
|
||||
|
||||
async def unseen(pool: asyncpg.Pool, account_id: int) -> FeedUnseen:
|
||||
seen_at = await pool.fetchval(
|
||||
"SELECT seen_at FROM feed_seen WHERE account_id = $1", account_id
|
||||
)
|
||||
counts = await pool.fetchrow(_UNSEEN, account_id, seen_at)
|
||||
latest = await list_feed(
|
||||
pool, account_id, FeedFilter(kind=FeedKind.MESSAGES), limit=1
|
||||
)
|
||||
return FeedUnseen(
|
||||
count=counts["deleted"] + counts["edited"],
|
||||
deleted=counts["deleted"],
|
||||
edited=counts["edited"],
|
||||
seen_at=seen_at,
|
||||
latest=latest.items[0] if latest.items else None,
|
||||
)
|
||||
|
||||
|
||||
async def mark_seen(
|
||||
pool: asyncpg.Pool, account_id: int, at: datetime | None
|
||||
) -> FeedUnseen:
|
||||
await pool.execute(_MARK_SEEN, account_id, at)
|
||||
return await unseen(pool, account_id)
|
||||
|
||||
|
||||
async def item_messages(
|
||||
pool: asyncpg.Pool,
|
||||
account_id: int,
|
||||
item_id: int,
|
||||
*,
|
||||
limit: int = DEFAULT_LIMIT,
|
||||
cursor: str | None = None,
|
||||
) -> FeedMessagesPage | None:
|
||||
row = await pool.fetchrow(
|
||||
"SELECT chat_id, since, at FROM feed_items "
|
||||
"WHERE id = $1 AND account_id = $2 AND kind = 'deleted'",
|
||||
item_id,
|
||||
account_id,
|
||||
)
|
||||
if row is None:
|
||||
return None
|
||||
size = max(1, min(limit, MAX_LIMIT))
|
||||
views = await chats.get_deleted_between(
|
||||
pool,
|
||||
account_id,
|
||||
row["chat_id"],
|
||||
row["since"],
|
||||
row["at"],
|
||||
size + 1,
|
||||
decode_cursor(cursor) if cursor else None,
|
||||
)
|
||||
page = views[:size]
|
||||
more = len(views) > size
|
||||
return FeedMessagesPage(
|
||||
messages=page,
|
||||
next_cursor=encode_cursor(page[-1].date, page[-1].message_id) if more else None,
|
||||
)
|
||||
@@ -38,6 +38,8 @@ class ChatListItem(BaseModel):
|
||||
last_date: datetime | None
|
||||
last_text: str | None
|
||||
last_sender_id: int | None
|
||||
last_message_id: int | None = None
|
||||
last_deleted: bool = False
|
||||
|
||||
|
||||
class DiscoverItem(BaseModel):
|
||||
@@ -204,6 +206,7 @@ class MessageView(BaseModel):
|
||||
is_animated_emoji: bool = False
|
||||
read: bool = False
|
||||
read_at: datetime | None = None
|
||||
has_note: bool = False
|
||||
|
||||
|
||||
class MessageVersionView(BaseModel):
|
||||
@@ -212,6 +215,50 @@ class MessageVersionView(BaseModel):
|
||||
text: str | None
|
||||
|
||||
|
||||
class FeedChat(BaseModel):
|
||||
chat_id: int
|
||||
title: str | None
|
||||
kind: str
|
||||
has_avatar: bool
|
||||
|
||||
|
||||
class FeedItem(BaseModel):
|
||||
id: int
|
||||
kind: str
|
||||
at: datetime
|
||||
since: datetime
|
||||
message_count: int
|
||||
chat: FeedChat
|
||||
message_id: int
|
||||
message: MessageView | None
|
||||
sender_id: int | None
|
||||
sender_name: str | None
|
||||
outgoing: bool
|
||||
before: str | None = None
|
||||
after: str | None = None
|
||||
has_before: bool = False
|
||||
edit_date: datetime | None = None
|
||||
detail: dict[str, list[str | None]] | None = None
|
||||
|
||||
|
||||
class FeedPage(BaseModel):
|
||||
items: list[FeedItem]
|
||||
next_cursor: str | None
|
||||
|
||||
|
||||
class FeedUnseen(BaseModel):
|
||||
count: int
|
||||
deleted: int
|
||||
edited: int
|
||||
seen_at: datetime | None
|
||||
latest: FeedItem | None
|
||||
|
||||
|
||||
class FeedMessagesPage(BaseModel):
|
||||
messages: list[MessageView]
|
||||
next_cursor: str | None
|
||||
|
||||
|
||||
class MediaView(BaseModel):
|
||||
id: int
|
||||
account_id: int
|
||||
@@ -567,6 +614,31 @@ class AnnotationView(BaseModel):
|
||||
updated_at: datetime
|
||||
|
||||
|
||||
class NoteView(AnnotationView):
|
||||
chat_title: str | None
|
||||
chat_has_avatar: bool
|
||||
message_text: str | None
|
||||
message_date: datetime | None
|
||||
message_has_media: bool
|
||||
message_deleted: bool
|
||||
|
||||
|
||||
class NoteTag(BaseModel):
|
||||
tag: str
|
||||
count: int
|
||||
|
||||
|
||||
class CaptureStatus(BaseModel):
|
||||
live: bool
|
||||
since: datetime | None
|
||||
last_seen: datetime | None
|
||||
|
||||
|
||||
class CaptureGap(BaseModel):
|
||||
start: datetime
|
||||
end: datetime
|
||||
|
||||
|
||||
class WatchView(BaseModel):
|
||||
id: int
|
||||
account_id: int
|
||||
|
||||
@@ -76,7 +76,7 @@ async def get_stories(
|
||||
"SELECT peer_id, story_id, date, expire_date, caption, media_kind, " # noqa: S608
|
||||
"storage_key, downloaded, views, pinned, deleted FROM stories "
|
||||
f"WHERE {where} "
|
||||
f"ORDER BY date DESC NULLS LAST LIMIT ${len(params) - 1} "
|
||||
f"ORDER BY date DESC NULLS LAST, story_id DESC LIMIT ${len(params) - 1} "
|
||||
f"OFFSET ${len(params)}",
|
||||
*params,
|
||||
)
|
||||
@@ -95,3 +95,16 @@ async def get_story(
|
||||
story_id,
|
||||
)
|
||||
return StoryView(**dict(row)) if row else None
|
||||
|
||||
|
||||
async def set_story_kind(
|
||||
pool: asyncpg.Pool, account_id: int, peer_id: int, story_id: int, kind: str
|
||||
) -> None:
|
||||
await pool.execute(
|
||||
"UPDATE stories SET media_kind = $4 "
|
||||
"WHERE account_id = $1 AND peer_id = $2 AND story_id = $3",
|
||||
account_id,
|
||||
peer_id,
|
||||
story_id,
|
||||
kind,
|
||||
)
|
||||
@@ -48,6 +48,29 @@ async def current_presence(
|
||||
return PresenceSample(**dict(row)) if row is not None else None
|
||||
|
||||
|
||||
_ONLINE = """
|
||||
SELECT peer_id, ts, status, last_online_date, next_offline_date
|
||||
FROM (
|
||||
SELECT DISTINCT ON (peer_id)
|
||||
peer_id, ts, status, last_online_date, next_offline_date
|
||||
FROM presence
|
||||
WHERE account_id = $1 AND peer_id = ANY($2::bigint[])
|
||||
AND ts > now() - interval '1 hour'
|
||||
ORDER BY peer_id, ts DESC
|
||||
) latest
|
||||
WHERE status = 'online' AND next_offline_date > now()
|
||||
"""
|
||||
|
||||
|
||||
async def online_now(
|
||||
pool: asyncpg.Pool, account_id: int, peer_ids: list[int]
|
||||
) -> list[PresenceSample]:
|
||||
if not peer_ids:
|
||||
return []
|
||||
rows = await pool.fetch(_ONLINE, account_id, peer_ids)
|
||||
return [PresenceSample(**dict(row)) for row in rows]
|
||||
|
||||
|
||||
async def presence_hourly(
|
||||
pool: asyncpg.Pool,
|
||||
account_id: int,
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
import re
|
||||
from collections.abc import Iterator
|
||||
from typing import Any
|
||||
|
||||
from utils.search.models import Found, FoundWhere
|
||||
|
||||
HIDDEN_KEYS = ("chat", "from_user", "sender_chat")
|
||||
SKIPPED_KEYS = ("_", "file_id", "file_unique_id")
|
||||
ENUM = re.compile(r"^[A-Z][A-Za-z]+\.[A-Z_]+$")
|
||||
|
||||
_HEADS: dict[str, FoundWhere] = {
|
||||
"text": "text",
|
||||
"caption": "text",
|
||||
"web_page": "preview",
|
||||
}
|
||||
_LEAVES: dict[str, FoundWhere] = {"url": "link", "file_name": "file"}
|
||||
|
||||
type Path = tuple[str | int, ...]
|
||||
|
||||
|
||||
def _scalars(node: object, path: Path = ()) -> Iterator[tuple[Path, str, object]]:
|
||||
if isinstance(node, dict):
|
||||
items = ((k, v) for k, v in node.items() if k not in SKIPPED_KEYS)
|
||||
elif isinstance(node, list):
|
||||
items = enumerate(node)
|
||||
else:
|
||||
return
|
||||
for key, value in items:
|
||||
if isinstance(value, dict | list):
|
||||
yield from _scalars(value, (*path, key))
|
||||
elif isinstance(value, str | int | float) and not isinstance(value, bool):
|
||||
yield (*path, key), str(value), node
|
||||
|
||||
|
||||
def _where(path: Path) -> FoundWhere:
|
||||
head, leaf = str(path[0]), str(path[-1])
|
||||
if head == "reply_markup":
|
||||
return "button"
|
||||
if leaf in _LEAVES:
|
||||
return _LEAVES[leaf]
|
||||
if head.startswith("forward"):
|
||||
return "forward"
|
||||
if head.startswith("reply_to"):
|
||||
return "reply"
|
||||
return _HEADS.get(head, "data")
|
||||
|
||||
|
||||
def find(raw: dict[str, Any], needle: str) -> Found | None:
|
||||
folded = needle.casefold()
|
||||
fallback = None
|
||||
for path, value, owner in _scalars(raw):
|
||||
if folded not in value.casefold() or ENUM.match(value):
|
||||
continue
|
||||
where = _where(path)
|
||||
button = owner.get("text") if isinstance(owner, dict) else None
|
||||
found = Found(
|
||||
where=where,
|
||||
path=".".join(map(str, path)),
|
||||
value=value,
|
||||
button=button if where == "button" else None,
|
||||
)
|
||||
if where != "text":
|
||||
return found
|
||||
fallback = fallback or found
|
||||
return fallback
|
||||
@@ -1,23 +1,59 @@
|
||||
from datetime import datetime
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from typing import Literal
|
||||
|
||||
from pydantic import BaseModel
|
||||
from pydantic import BaseModel, field_validator
|
||||
|
||||
DEFAULT_LIMIT = 50
|
||||
MAX_LIMIT = 500
|
||||
|
||||
_EPOCH = datetime(1970, 1, 1, tzinfo=UTC)
|
||||
_MICROSECOND = timedelta(microseconds=1)
|
||||
|
||||
ChatKind = Literal["private", "group", "channel"]
|
||||
HitSource = Literal["text", "stt", "version", "data"]
|
||||
FoundWhere = Literal[
|
||||
"text", "button", "link", "forward", "reply", "file", "preview", "data"
|
||||
]
|
||||
|
||||
|
||||
def encode_cursor(date: datetime, chat_id: int, message_id: int) -> str:
|
||||
return f"{(date - _EPOCH) // _MICROSECOND}_{chat_id}_{message_id}"
|
||||
|
||||
|
||||
def decode_cursor(cursor: str) -> tuple[datetime, int, int]:
|
||||
micros, chat_id, message_id = (int(part) for part in cursor.split("_"))
|
||||
return _EPOCH + micros * _MICROSECOND, chat_id, message_id
|
||||
|
||||
|
||||
class SearchFilters(BaseModel):
|
||||
account_id: int
|
||||
query: str | None = None
|
||||
chat_id: int | None = None
|
||||
sender_id: int | None = None
|
||||
kind: ChatKind | None = None
|
||||
has_media: bool | None = None
|
||||
deleted: bool | None = None
|
||||
edited: bool | None = None
|
||||
date_from: datetime | None = None
|
||||
date_to: datetime | None = None
|
||||
regex: str | None = None
|
||||
everywhere: bool = False
|
||||
cursor: str | None = None
|
||||
limit: int = DEFAULT_LIMIT
|
||||
offset: int = 0
|
||||
|
||||
@field_validator("cursor")
|
||||
@classmethod
|
||||
def _valid_cursor(cls, value: str | None) -> str | None:
|
||||
if value is not None:
|
||||
decode_cursor(value)
|
||||
return value
|
||||
|
||||
|
||||
class Found(BaseModel):
|
||||
where: FoundWhere
|
||||
path: str
|
||||
value: str
|
||||
button: str | None = None
|
||||
|
||||
|
||||
class SearchHit(BaseModel):
|
||||
@@ -26,5 +62,19 @@ class SearchHit(BaseModel):
|
||||
date: datetime
|
||||
sender_id: int | None
|
||||
text: str | None
|
||||
source: Literal["text", "stt"]
|
||||
extracted_text: str | None
|
||||
has_media: bool
|
||||
media_kind: str | None
|
||||
edited_at: datetime | None
|
||||
deleted_at: datetime | None
|
||||
source: HitSource
|
||||
extracted_text: str | None = None
|
||||
version_text: str | None = None
|
||||
version_at: datetime | None = None
|
||||
found: Found | None = None
|
||||
|
||||
|
||||
class SearchPage(BaseModel):
|
||||
hits: list[SearchHit]
|
||||
next_cursor: str | None
|
||||
terms: list[str]
|
||||
scanned_to: datetime | None = None
|
||||
@@ -1,88 +1,279 @@
|
||||
import json
|
||||
import re
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from time import monotonic
|
||||
|
||||
import asyncpg
|
||||
|
||||
from utils.search.models import MAX_LIMIT, SearchFilters, SearchHit
|
||||
|
||||
_TEXT_TSV = "to_tsvector('russian', coalesce(m.text, ''))"
|
||||
_STT_TSV = "to_tsvector('russian', coalesce(md.extracted_text, ''))"
|
||||
_TSQUERY = "websearch_to_tsquery('russian', ${})"
|
||||
|
||||
_HITS = "{cols} FROM messages m WHERE {where}" # text branch
|
||||
_STT_HITS = (
|
||||
"{cols} FROM messages m "
|
||||
"JOIN media md ON md.account_id = m.account_id "
|
||||
"AND md.chat_id = m.chat_id AND md.message_id = m.message_id "
|
||||
"WHERE {where}"
|
||||
from utils.read.message_view import load_raw
|
||||
from utils.search.found import ENUM, HIDDEN_KEYS, SKIPPED_KEYS, find
|
||||
from utils.search.models import (
|
||||
MAX_LIMIT,
|
||||
ChatKind,
|
||||
SearchFilters,
|
||||
SearchHit,
|
||||
SearchPage,
|
||||
decode_cursor,
|
||||
encode_cursor,
|
||||
)
|
||||
_TEXT_COLS = (
|
||||
"SELECT m.chat_id, m.message_id, m.date, m.sender_id, m.text, "
|
||||
"'text' AS source, NULL::text AS extracted_text"
|
||||
|
||||
MIN_NEEDLE = 3
|
||||
_WINDOW = timedelta(days=7)
|
||||
_BUDGET_SECONDS = 2.5
|
||||
_BOTTOM = -(2**63)
|
||||
_LIKE_SPECIAL = re.compile(r"([\\%_])")
|
||||
|
||||
_PARSE = """
|
||||
SELECT (regexp_replace(websearch_to_tsquery('russian', q)::text,
|
||||
'''((?:[^'']|''''){3,})''', '''\\1'':*', 'g')::tsquery
|
||||
|| regexp_replace(websearch_to_tsquery('simple', q)::text,
|
||||
'''((?:[^'']|''''){3,})''', '''\\1'':*', 'g')::tsquery
|
||||
)::text AS tsquery,
|
||||
tsvector_to_array(search_vector(q)) AS terms
|
||||
FROM translate($1, 'Ёё', 'Ее') AS q
|
||||
"""
|
||||
|
||||
_CHANNELS = """
|
||||
SELECT coalesce(array_agg(chat_id), '{}'::bigint[]) FROM (
|
||||
SELECT DISTINCT ON (chat_id) chat_id,
|
||||
coalesce(raw->'chat'->>'type', raw->>'type') AS type
|
||||
FROM chat_history
|
||||
WHERE account_id = $1
|
||||
AND coalesce(raw->'chat'->>'type', raw->>'type') IS NOT NULL
|
||||
ORDER BY chat_id, ts DESC
|
||||
) typed WHERE type = 'ChatType.CHANNEL'
|
||||
"""
|
||||
|
||||
_KEY_ORDER = "s.date DESC, s.chat_id DESC, s.message_id DESC"
|
||||
|
||||
_COLS = (
|
||||
"s.chat_id, s.message_id, s.date, s.sender_id, s.text, s.has_media, "
|
||||
"s.edited_at, s.deleted_at"
|
||||
)
|
||||
_STT_COLS = (
|
||||
"SELECT m.chat_id, m.message_id, m.date, m.sender_id, m.text, "
|
||||
"'stt' AS source, md.extracted_text"
|
||||
|
||||
_TEXT = (
|
||||
f"SELECT {_COLS}, 0 AS rank, NULL::text AS extracted_text, " # noqa: S608
|
||||
"NULL::text AS version_text, NULL::timestamptz AS version_at "
|
||||
"FROM message_search s WHERE {where}"
|
||||
)
|
||||
|
||||
_PROBE = (
|
||||
"CROSS JOIN LATERAL (SELECT * FROM message_search s "
|
||||
"WHERE s.chat_id = {source}.chat_id AND s.message_id = {source}.message_id "
|
||||
"AND {where} LIMIT 1) s "
|
||||
)
|
||||
|
||||
_STT = (
|
||||
f"SELECT {_COLS}, 1 AS rank, md.extracted_text, NULL::text, " # noqa: S608
|
||||
"NULL::timestamptz FROM media md "
|
||||
f"{_PROBE.replace('{source}', 'md')}"
|
||||
"WHERE md.account_id = {account} "
|
||||
"AND search_vector(md.extracted_text) @@ {tsquery}"
|
||||
)
|
||||
|
||||
_VERSION = (
|
||||
"SELECT DISTINCT ON (s.date, s.chat_id, s.message_id) " # noqa: S608
|
||||
f"{_COLS}, 2 AS rank, NULL::text, v.text, v.observed_at "
|
||||
"FROM message_versions v "
|
||||
f"{_PROBE.replace('{source}', 'v')}"
|
||||
"WHERE v.account_id = {account} "
|
||||
"AND search_vector(v.text) @@ {tsquery}"
|
||||
)
|
||||
|
||||
_WITH_MEDIA = (
|
||||
"SELECT h.*, md.kind AS media_kind FROM ({hits}) h "
|
||||
"LEFT JOIN media md ON md.account_id = {account} "
|
||||
"AND md.chat_id = h.chat_id AND md.message_id = h.message_id "
|
||||
"ORDER BY h.date DESC, h.chat_id DESC, h.message_id DESC"
|
||||
)
|
||||
|
||||
_SOURCES = ("text", "stt", "version")
|
||||
|
||||
_OLDEST = "SELECT min(date) FROM message_search WHERE account_id = $1"
|
||||
|
||||
_VALUE_MATCH = (
|
||||
'strict $.** ? (@.type() == "object").keyvalue() ? ('
|
||||
+ "".join(f'@.key != "{key}" && ' for key in SKIPPED_KEYS)
|
||||
+ '(@.value.type() == "string" || @.value.type() == "number") && '
|
||||
f"!(@.value.string() like_regex {json.dumps(ENUM.pattern)}) && "
|
||||
'@.value.string() like_regex {needle} flag "iq")'
|
||||
)
|
||||
|
||||
_EVERYWHERE = (
|
||||
f"SELECT {_COLS}, s.raw - {{hidden}}::text[] AS raw " # noqa: S608
|
||||
"FROM messages s WHERE {where} "
|
||||
"AND CASE WHEN s.raw::text ILIKE {like} "
|
||||
"THEN jsonb_path_exists(s.raw - {hidden}::text[], {path}::jsonpath) "
|
||||
f"ELSE false END ORDER BY {_KEY_ORDER} LIMIT {{limit}}"
|
||||
)
|
||||
|
||||
|
||||
def _common_conditions(filters: SearchFilters, params: list[object]) -> list[str]:
|
||||
params.append(filters.account_id)
|
||||
conds = [f"m.account_id = ${len(params)}"]
|
||||
if filters.chat_id is not None:
|
||||
params.append(filters.chat_id)
|
||||
conds.append(f"m.chat_id = ${len(params)}")
|
||||
if filters.sender_id is not None:
|
||||
params.append(filters.sender_id)
|
||||
conds.append(f"m.sender_id = ${len(params)}")
|
||||
if filters.has_media is not None:
|
||||
params.append(filters.has_media)
|
||||
conds.append(f"m.has_media = ${len(params)}")
|
||||
if filters.date_from is not None:
|
||||
params.append(filters.date_from)
|
||||
conds.append(f"m.date >= ${len(params)}")
|
||||
if filters.date_to is not None:
|
||||
params.append(filters.date_to)
|
||||
conds.append(f"m.date <= ${len(params)}")
|
||||
class _Binder:
|
||||
def __init__(self) -> None:
|
||||
self.params: list[object] = []
|
||||
|
||||
def __call__(self, value: object) -> str:
|
||||
self.params.append(value)
|
||||
return f"${len(self.params)}"
|
||||
|
||||
|
||||
def _kind(kind: ChatKind, channels: list[int], bind: _Binder) -> str:
|
||||
if kind == "private":
|
||||
return "s.chat_id > 0"
|
||||
member = f"s.chat_id = ANY({bind(channels)}::bigint[])"
|
||||
return member if kind == "channel" else f"s.chat_id < 0 AND NOT {member}"
|
||||
|
||||
|
||||
def _conditions(
|
||||
filters: SearchFilters, channels: list[int], bind: _Binder
|
||||
) -> list[str]:
|
||||
conds = [f"s.account_id = {bind(filters.account_id)}"]
|
||||
compared = (
|
||||
("s.chat_id =", filters.chat_id),
|
||||
("s.sender_id =", filters.sender_id),
|
||||
("s.has_media =", filters.has_media),
|
||||
("s.date >=", filters.date_from),
|
||||
("s.date <=", filters.date_to),
|
||||
("s.text ~", filters.regex),
|
||||
)
|
||||
conds += [f"{left} {bind(value)}" for left, value in compared if value is not None]
|
||||
flags = (("s.deleted_at", filters.deleted), ("s.edited_at", filters.edited))
|
||||
conds += [
|
||||
f"{column} IS {'NOT ' if flag else ''}NULL"
|
||||
for column, flag in flags
|
||||
if flag is not None
|
||||
]
|
||||
if filters.kind is not None:
|
||||
conds.append(_kind(filters.kind, channels, bind))
|
||||
if filters.cursor is not None:
|
||||
date, chat_id, message_id = decode_cursor(filters.cursor)
|
||||
conds.append(
|
||||
"(s.date, s.chat_id, s.message_id) < "
|
||||
f"({bind(date)}, {bind(chat_id)}, {bind(message_id)})"
|
||||
)
|
||||
return conds
|
||||
|
||||
|
||||
async def search_messages(
|
||||
pool: asyncpg.Pool, filters: SearchFilters
|
||||
) -> list[SearchHit]:
|
||||
query = filters.query.strip() if filters.query else None
|
||||
params: list[object] = []
|
||||
common = _common_conditions(filters, params)
|
||||
if filters.regex is not None:
|
||||
params.append(filters.regex)
|
||||
common.append(f"m.text ~ ${len(params)}")
|
||||
def _branch(sql: str, limit: str, order: str = _KEY_ORDER, **parts: str) -> str:
|
||||
return f"({sql.format(**parts)} ORDER BY {order} LIMIT {limit})"
|
||||
|
||||
q_idx: int | None = None
|
||||
if query is not None:
|
||||
params.append(query)
|
||||
q_idx = len(params)
|
||||
|
||||
text_conds = [*common]
|
||||
if q_idx is not None:
|
||||
text_conds.append(f"{_TEXT_TSV} @@ {_TSQUERY.format(q_idx)}")
|
||||
async def search_messages(pool: asyncpg.Pool, filters: SearchFilters) -> SearchPage:
|
||||
async with pool.acquire() as conn, conn.transaction():
|
||||
await conn.execute("SET LOCAL jit = off")
|
||||
if filters.everywhere:
|
||||
return await _everywhere(conn, filters)
|
||||
return await _search(conn, filters)
|
||||
|
||||
branches = [_HITS.format(cols=_TEXT_COLS, where=" AND ".join(text_conds))]
|
||||
if q_idx is not None:
|
||||
stt_conds = [*common, f"{_STT_TSV} @@ {_TSQUERY.format(q_idx)}"]
|
||||
branches.append(_STT_HITS.format(cols=_STT_COLS, where=" AND ".join(stt_conds)))
|
||||
|
||||
params.append(min(filters.limit, MAX_LIMIT))
|
||||
limit_idx = len(params)
|
||||
params.append(filters.offset)
|
||||
offset_idx = len(params)
|
||||
page = f"ORDER BY date DESC LIMIT ${limit_idx} OFFSET ${offset_idx}"
|
||||
async def _channels(conn: asyncpg.Connection, filters: SearchFilters) -> list[int]:
|
||||
if filters.kind in {"group", "channel"}:
|
||||
return await conn.fetchval(_CHANNELS, filters.account_id)
|
||||
return []
|
||||
|
||||
if len(branches) == 1:
|
||||
sql = f"SELECT * FROM ({branches[0]}) hits {page}" # noqa: S608
|
||||
else:
|
||||
union = " UNION ALL ".join(f"({b})" for b in branches)
|
||||
dedup = (
|
||||
"SELECT DISTINCT ON (chat_id, message_id) * " # noqa: S608
|
||||
f"FROM ({union}) hits ORDER BY chat_id, message_id, source DESC"
|
||||
|
||||
def _data_hit(row: asyncpg.Record, needle: str) -> SearchHit:
|
||||
data = dict(row)
|
||||
raw = load_raw(data.pop("raw"))
|
||||
return SearchHit(**data, source="data", found=find(raw, needle))
|
||||
|
||||
|
||||
async def _everywhere(conn: asyncpg.Connection, filters: SearchFilters) -> SearchPage:
|
||||
needle = (filters.query or "").strip()
|
||||
floor = filters.date_from or await conn.fetchval(_OLDEST, filters.account_id)
|
||||
if len(needle) < MIN_NEEDLE or floor is None:
|
||||
return SearchPage(hits=[], next_cursor=None, terms=[])
|
||||
channels = await _channels(conn, filters)
|
||||
quoted = json.dumps(needle, ensure_ascii=False)
|
||||
like = _LIKE_SPECIAL.sub(r"\\\1", quoted[1:-1])
|
||||
path = _VALUE_MATCH.format(needle=quoted)
|
||||
size = min(filters.limit, MAX_LIMIT)
|
||||
cursor = filters.cursor
|
||||
top = decode_cursor(cursor)[0] if cursor else None
|
||||
hits: list[SearchHit] = []
|
||||
started = monotonic()
|
||||
while True:
|
||||
lower = max((top or filters.date_to or datetime.now(UTC)) - _WINDOW, floor)
|
||||
bind = _Binder()
|
||||
conds = _conditions(
|
||||
filters.model_copy(update={"cursor": cursor}), channels, bind
|
||||
)
|
||||
sql = f"SELECT * FROM ({dedup}) d {page}" # noqa: S608
|
||||
conds.append(f"s.date >= {bind(lower)}")
|
||||
if top is not None:
|
||||
conds.append(f"s.date <= {bind(top)}")
|
||||
limit = size - len(hits)
|
||||
sql = _EVERYWHERE.format(
|
||||
where=" AND ".join(conds),
|
||||
hidden=bind(list(HIDDEN_KEYS)),
|
||||
like=bind(f"%{like}%"),
|
||||
path=bind(path),
|
||||
limit=bind(limit),
|
||||
)
|
||||
account = bind(filters.account_id)
|
||||
rows = await conn.fetch(
|
||||
_WITH_MEDIA.format(hits=sql, account=account), *bind.params
|
||||
)
|
||||
hits += [_data_hit(row, needle) for row in rows]
|
||||
if len(rows) >= limit:
|
||||
last = rows[-1]
|
||||
top = last["date"]
|
||||
cursor = encode_cursor(top, last["chat_id"], last["message_id"])
|
||||
elif lower > floor:
|
||||
top = lower
|
||||
cursor = encode_cursor(lower, _BOTTOM, _BOTTOM)
|
||||
else:
|
||||
return SearchPage(hits=hits, next_cursor=None, terms=[], scanned_to=floor)
|
||||
if len(hits) >= size or monotonic() - started > _BUDGET_SECONDS:
|
||||
return SearchPage(hits=hits, next_cursor=cursor, terms=[], scanned_to=top)
|
||||
|
||||
rows = await pool.fetch(sql, *params)
|
||||
return [SearchHit(**dict(row)) for row in rows]
|
||||
|
||||
async def _search(conn: asyncpg.Connection, filters: SearchFilters) -> SearchPage:
|
||||
query = (filters.query or "").strip()
|
||||
terms: list[str] = []
|
||||
tsquery = None
|
||||
if query:
|
||||
parsed = await conn.fetchrow(_PARSE, query)
|
||||
terms = list(parsed["terms"])
|
||||
if not parsed["tsquery"]:
|
||||
return SearchPage(hits=[], next_cursor=None, terms=terms)
|
||||
tsquery = parsed["tsquery"]
|
||||
|
||||
channels = await _channels(conn, filters)
|
||||
bind = _Binder()
|
||||
where = " AND ".join(_conditions(filters, channels, bind))
|
||||
size = min(filters.limit, MAX_LIMIT)
|
||||
limit = bind(size + 1)
|
||||
|
||||
account = bind(filters.account_id)
|
||||
if tsquery is None:
|
||||
sql = _branch(_TEXT, limit, where=where)
|
||||
else:
|
||||
match = f"{bind(tsquery)}::tsquery"
|
||||
branches = (
|
||||
_branch(_TEXT, limit, where=f"{where} AND s.tsv @@ {match}"),
|
||||
_branch(_STT, limit, where=where, account=account, tsquery=match),
|
||||
_branch(
|
||||
_VERSION,
|
||||
limit,
|
||||
f"{_KEY_ORDER}, v.observed_at DESC",
|
||||
where=where,
|
||||
account=account,
|
||||
tsquery=match,
|
||||
),
|
||||
)
|
||||
sql = (
|
||||
"SELECT DISTINCT ON (date, chat_id, message_id) * FROM (" # noqa: S608
|
||||
f"{' UNION ALL '.join(branches)}) s "
|
||||
f"ORDER BY {_KEY_ORDER}, rank LIMIT {limit}"
|
||||
)
|
||||
|
||||
rows = await conn.fetch(_WITH_MEDIA.format(hits=sql, account=account), *bind.params)
|
||||
hits = [
|
||||
SearchHit(**{**dict(row), "source": _SOURCES[row["rank"]]})
|
||||
for row in rows[:size]
|
||||
]
|
||||
next_cursor = None
|
||||
if len(rows) > size:
|
||||
last = hits[-1]
|
||||
next_cursor = encode_cursor(last.date, last.chat_id, last.message_id)
|
||||
return SearchPage(hits=hits, next_cursor=next_cursor, terms=terms)
|
||||
@@ -24,6 +24,10 @@ class ContentAddressedStorage:
|
||||
def get(self, key: str) -> bytes:
|
||||
return self._path(key).read_bytes()
|
||||
|
||||
def head(self, key: str, size: int = 16) -> bytes:
|
||||
with self._path(key).open("rb") as file:
|
||||
return file.read(size)
|
||||
|
||||
def exists(self, key: str) -> bool:
|
||||
return self._path(key).exists()
|
||||
|
||||
|
||||
@@ -113,6 +113,12 @@ class BotRegistry:
|
||||
def running(self) -> list[int]:
|
||||
return list(self._running)
|
||||
|
||||
@property
|
||||
def connected_accounts(self) -> list[int]:
|
||||
return [
|
||||
bot.account_id for bot in self._running.values() if bot.client.is_connected
|
||||
]
|
||||
|
||||
async def sync(self) -> None:
|
||||
async with self._lock:
|
||||
await self._adopt_dropped_in()
|
||||
|
||||
@@ -6,6 +6,7 @@ import asyncpg
|
||||
import uvloop
|
||||
|
||||
from dependencies.container import container
|
||||
from userbot.modules.uptime import repository as uptime
|
||||
from utils.listen import Listener
|
||||
from utils.logging import logger, setup_logging
|
||||
from utils.read.bots import BOTS_CHANGED_CHANNEL
|
||||
@@ -16,6 +17,7 @@ from watcher.registry import BotRegistry
|
||||
setup_logging()
|
||||
|
||||
RETRY_INTERVAL = 300
|
||||
UPTIME_INTERVAL = 60
|
||||
|
||||
|
||||
async def _retry_loop(registry: BotRegistry) -> None:
|
||||
@@ -27,6 +29,14 @@ async def _retry_loop(registry: BotRegistry) -> None:
|
||||
logger.exception("[red]Bot sync failed[/]")
|
||||
|
||||
|
||||
async def _keep_uptime(registry: BotRegistry, pool: asyncpg.Pool) -> None:
|
||||
while True:
|
||||
for account_id in registry.connected_accounts:
|
||||
with contextlib.suppress(Exception):
|
||||
await uptime.heartbeat(pool, account_id)
|
||||
await asyncio.sleep(UPTIME_INTERVAL)
|
||||
|
||||
|
||||
def _change_listener(registry: BotRegistry, tasks: set[asyncio.Task]) -> Listener:
|
||||
def on_change(_payload: str) -> None:
|
||||
task = asyncio.create_task(registry.sync())
|
||||
@@ -58,6 +68,7 @@ async def runner() -> None:
|
||||
stop = asyncio.Event()
|
||||
asyncio.get_running_loop().add_signal_handler(signal.SIGTERM, stop.set)
|
||||
retry = asyncio.create_task(_retry_loop(registry))
|
||||
beat = asyncio.create_task(_keep_uptime(registry, pool))
|
||||
try:
|
||||
await registry.sync()
|
||||
if not registry.running:
|
||||
@@ -66,9 +77,10 @@ async def runner() -> None:
|
||||
logger.info("[green]Bot watcher running.[/]")
|
||||
await stop.wait()
|
||||
finally:
|
||||
retry.cancel()
|
||||
with contextlib.suppress(asyncio.CancelledError):
|
||||
await retry
|
||||
for task in (retry, beat):
|
||||
task.cancel()
|
||||
with contextlib.suppress(asyncio.CancelledError):
|
||||
await task
|
||||
await listener.stop()
|
||||
await registry.close()
|
||||
await container.close()
|
||||
|
||||
Vendored
+6
-5
@@ -1,13 +1,14 @@
|
||||
// See https://svelte.dev/docs/kit/types#app.d.ts
|
||||
// for information about these interfaces
|
||||
import type { PanelState } from "#lib/stores/ui.svelte.js";
|
||||
|
||||
declare global {
|
||||
namespace App {
|
||||
// interface Error {}
|
||||
// interface Locals {}
|
||||
// interface PageData {}
|
||||
// interface PageState {}
|
||||
interface PageState {
|
||||
inApp?: boolean;
|
||||
panel?: PanelState;
|
||||
}
|
||||
// interface Platform {}
|
||||
}
|
||||
}
|
||||
|
||||
export {};
|
||||
@@ -0,0 +1,32 @@
|
||||
import { request } from "#lib/api/client.js";
|
||||
import type { PresenceSample } from "#lib/api/types.js";
|
||||
|
||||
export interface CaptureStatus {
|
||||
last_seen: string | null;
|
||||
live: boolean;
|
||||
since: string | null;
|
||||
}
|
||||
|
||||
export interface CaptureGap {
|
||||
end: string;
|
||||
start: string;
|
||||
}
|
||||
|
||||
export function getCaptureStatus(accountId: number): Promise<CaptureStatus> {
|
||||
return request<CaptureStatus>("/capture/status", {
|
||||
query: { account_id: accountId },
|
||||
});
|
||||
}
|
||||
|
||||
export function getCaptureGaps(accountId: number): Promise<CaptureGap[]> {
|
||||
return request<CaptureGap[]>("/capture/gaps", {
|
||||
query: { account_id: accountId },
|
||||
});
|
||||
}
|
||||
|
||||
export function getOnline(peerIds: number[]): Promise<PresenceSample[]> {
|
||||
return request<PresenceSample[]>("/presence/online", {
|
||||
account: true,
|
||||
query: { peer_ids: peerIds.join(",") },
|
||||
});
|
||||
}
|
||||
@@ -9,6 +9,11 @@ import type {
|
||||
ChatLinkView,
|
||||
DayCount,
|
||||
DiscoverItem,
|
||||
FeedChatKind,
|
||||
FeedKind,
|
||||
FeedMessagesPage,
|
||||
FeedPage,
|
||||
FeedUnseen,
|
||||
Folder,
|
||||
JobStatus,
|
||||
JobView,
|
||||
@@ -36,7 +41,8 @@ import type {
|
||||
ReadInfo,
|
||||
ResponseStats,
|
||||
ScopeTarget,
|
||||
SearchHit,
|
||||
SearchPage,
|
||||
SearchQuery,
|
||||
StorageChat,
|
||||
StorageFile,
|
||||
StorageGroupName,
|
||||
@@ -274,6 +280,39 @@ export function listDeleted(
|
||||
});
|
||||
}
|
||||
|
||||
export interface FeedQuery {
|
||||
chat_id?: number;
|
||||
chat_kind?: FeedChatKind;
|
||||
cursor?: string;
|
||||
kind?: FeedKind;
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
export function listFeed(query: FeedQuery = {}): Promise<FeedPage> {
|
||||
return request<FeedPage>("/feed", { account: true, query: { ...query } });
|
||||
}
|
||||
|
||||
export function getFeedUnseen(): Promise<FeedUnseen> {
|
||||
return request<FeedUnseen>("/feed/unseen", { account: true });
|
||||
}
|
||||
|
||||
export function markFeedSeen(at?: string): Promise<FeedUnseen> {
|
||||
return request<FeedUnseen>("/feed/seen", {
|
||||
body: { account_id: accounts.selectedId, at },
|
||||
method: "POST",
|
||||
});
|
||||
}
|
||||
|
||||
export function listFeedMessages(
|
||||
itemId: number,
|
||||
query: { cursor?: string; limit?: number } = {}
|
||||
): Promise<FeedMessagesPage> {
|
||||
return request<FeedMessagesPage>(`/feed/${itemId}/messages`, {
|
||||
account: true,
|
||||
query: { ...query },
|
||||
});
|
||||
}
|
||||
|
||||
export function getPeer(peerId: number): Promise<PeerView> {
|
||||
return request<PeerView>(`/peers/${peerId}`, { account: true });
|
||||
}
|
||||
@@ -517,14 +556,8 @@ export function getMessageMedia(
|
||||
});
|
||||
}
|
||||
|
||||
export function searchMessages(
|
||||
query: string,
|
||||
options: Page & { chat_id?: number } = {}
|
||||
): Promise<SearchHit[]> {
|
||||
return request<SearchHit[]>("/search", {
|
||||
account: true,
|
||||
query: { query, ...options },
|
||||
});
|
||||
export function searchMessages(query: SearchQuery): Promise<SearchPage> {
|
||||
return request<SearchPage>("/search", { account: true, query: { ...query } });
|
||||
}
|
||||
|
||||
export function fetchMedia(
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { request } from "#lib/api/client.js";
|
||||
import type { Annotation } from "#lib/api/types.js";
|
||||
|
||||
export interface Note extends Annotation {
|
||||
chat_has_avatar: boolean;
|
||||
chat_title: string | null;
|
||||
message_date: string | null;
|
||||
message_deleted: boolean;
|
||||
message_has_media: boolean;
|
||||
message_text: string | null;
|
||||
}
|
||||
|
||||
export interface NoteTag {
|
||||
count: number;
|
||||
tag: string;
|
||||
}
|
||||
|
||||
export function listNotes(
|
||||
tag: string | null,
|
||||
offset: number,
|
||||
limit: number
|
||||
): Promise<Note[]> {
|
||||
return request<Note[]>("/annotations/notes", {
|
||||
account: true,
|
||||
query: { limit, offset, tag },
|
||||
});
|
||||
}
|
||||
|
||||
export function listNoteTags(): Promise<NoteTag[]> {
|
||||
return request<NoteTag[]>("/annotations/tags", { account: true });
|
||||
}
|
||||
@@ -7,7 +7,26 @@ export type PolicyScopeType =
|
||||
| "default_channel"
|
||||
| "folder"
|
||||
| "chat";
|
||||
export type SearchSource = "text" | "stt";
|
||||
export type SearchSource = "text" | "stt" | "version" | "data";
|
||||
|
||||
export type FoundWhere =
|
||||
| "text"
|
||||
| "button"
|
||||
| "link"
|
||||
| "forward"
|
||||
| "reply"
|
||||
| "file"
|
||||
| "preview"
|
||||
| "data";
|
||||
|
||||
export interface SearchFound {
|
||||
button: string | null;
|
||||
path: string;
|
||||
value: string;
|
||||
where: FoundWhere;
|
||||
}
|
||||
|
||||
export type SearchChatKind = "private" | "group" | "channel";
|
||||
export type JobStatus =
|
||||
| "pending"
|
||||
| "running"
|
||||
@@ -43,6 +62,8 @@ export interface Chat {
|
||||
is_contact: boolean;
|
||||
kind: ChatKind;
|
||||
last_date: string | null;
|
||||
last_deleted: boolean;
|
||||
last_message_id: number | null;
|
||||
last_sender_id: number | null;
|
||||
last_text: string | null;
|
||||
message_count: number;
|
||||
@@ -194,6 +215,7 @@ export interface MessageView {
|
||||
entities: EntityView[];
|
||||
forward: ForwardView | null;
|
||||
has_media: boolean;
|
||||
has_note: boolean;
|
||||
inline_buttons: InlineButton[][];
|
||||
is_animated_emoji: boolean;
|
||||
is_self_destruct: boolean;
|
||||
@@ -222,6 +244,53 @@ export interface MessageVersion {
|
||||
text: string | null;
|
||||
}
|
||||
|
||||
export type FeedKind = "all" | "deleted" | "edited" | "profile";
|
||||
export type FeedChatKind = "dm" | "group" | "channel";
|
||||
|
||||
export interface FeedChat {
|
||||
chat_id: number;
|
||||
has_avatar: boolean;
|
||||
kind: FeedChatKind;
|
||||
title: string | null;
|
||||
}
|
||||
|
||||
export interface FeedItem {
|
||||
after: string | null;
|
||||
at: string;
|
||||
before: string | null;
|
||||
chat: FeedChat;
|
||||
detail: Record<string, [string | null, string | null]> | null;
|
||||
edit_date: string | null;
|
||||
has_before: boolean;
|
||||
id: number;
|
||||
kind: Exclude<FeedKind, "all">;
|
||||
message: MessageView | null;
|
||||
message_count: number;
|
||||
message_id: number;
|
||||
outgoing: boolean;
|
||||
sender_id: number | null;
|
||||
sender_name: string | null;
|
||||
since: string;
|
||||
}
|
||||
|
||||
export interface FeedPage {
|
||||
items: FeedItem[];
|
||||
next_cursor: string | null;
|
||||
}
|
||||
|
||||
export interface FeedUnseen {
|
||||
count: number;
|
||||
deleted: number;
|
||||
edited: number;
|
||||
latest: FeedItem | null;
|
||||
seen_at: string | null;
|
||||
}
|
||||
|
||||
export interface FeedMessagesPage {
|
||||
messages: MessageView[];
|
||||
next_cursor: string | null;
|
||||
}
|
||||
|
||||
export interface MediaVersion {
|
||||
file_size: number | null;
|
||||
id: number;
|
||||
@@ -234,11 +303,40 @@ export interface MediaVersion {
|
||||
export interface SearchHit {
|
||||
chat_id: number;
|
||||
date: string;
|
||||
deleted_at: string | null;
|
||||
edited_at: string | null;
|
||||
extracted_text: string | null;
|
||||
found: SearchFound | null;
|
||||
has_media: boolean;
|
||||
media_kind: string | null;
|
||||
message_id: number;
|
||||
sender_id: number | null;
|
||||
source: SearchSource;
|
||||
text: string | null;
|
||||
version_at: string | null;
|
||||
version_text: string | null;
|
||||
}
|
||||
|
||||
export interface SearchPage {
|
||||
hits: SearchHit[];
|
||||
next_cursor: string | null;
|
||||
scanned_to: string | null;
|
||||
terms: string[];
|
||||
}
|
||||
|
||||
export interface SearchQuery {
|
||||
chat_id?: number;
|
||||
cursor?: string;
|
||||
date_from?: string;
|
||||
date_to?: string;
|
||||
deleted?: boolean;
|
||||
edited?: boolean;
|
||||
everywhere?: boolean;
|
||||
has_media?: boolean;
|
||||
kind?: SearchChatKind;
|
||||
limit?: number;
|
||||
query?: string;
|
||||
sender_id?: number;
|
||||
}
|
||||
|
||||
export interface MediaView {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import type { MessageView } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { accountName, peerName } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
|
||||
@@ -16,10 +17,12 @@
|
||||
|
||||
function nameOf(id: number | null): string {
|
||||
if (id === null) {
|
||||
return "Someone";
|
||||
return t("service.someone");
|
||||
}
|
||||
if (id === ownId) {
|
||||
return accounts.selected ? accountName(accounts.selected) : "You";
|
||||
return accounts.selected
|
||||
? accountName(accounts.selected)
|
||||
: t("service.you");
|
||||
}
|
||||
const peer = peers.get(id);
|
||||
return peer ? peerName(peer) : String(id);
|
||||
@@ -44,35 +47,39 @@
|
||||
const selfJoin =
|
||||
members.length === 1 && members[0] === message.sender_id;
|
||||
if (selfJoin) {
|
||||
return `${actor} joined the group`;
|
||||
return t("service.joined", { actor });
|
||||
}
|
||||
const names = members.map(nameOf).join(", ");
|
||||
return names ? `${actor} added ${names}` : `${actor} joined the group`;
|
||||
return names
|
||||
? t("service.added", { actor, names })
|
||||
: t("service.joined", { actor });
|
||||
}
|
||||
case "left_chat_members":
|
||||
return `${actor} left the group`;
|
||||
return t("service.left", { actor });
|
||||
case "pinned_message":
|
||||
return `${actor} pinned a message`;
|
||||
return t("service.pinned", { actor });
|
||||
case "group_chat_created":
|
||||
return `${actor} created the group`;
|
||||
return t("service.groupCreated", { actor });
|
||||
case "channel_chat_created":
|
||||
return "Channel created";
|
||||
return t("service.channelCreated");
|
||||
case "phone_call_ended":
|
||||
return service.duration === null
|
||||
? "Call ended"
|
||||
: `Call ended · ${durationOf(service.duration)}`;
|
||||
? t("service.callEnded")
|
||||
: t("service.callEndedAfter", {
|
||||
duration: durationOf(service.duration),
|
||||
});
|
||||
case "phone_call_started":
|
||||
return "Call started";
|
||||
return t("service.callStarted");
|
||||
case "poll_option_added":
|
||||
return `${actor} added a poll option`;
|
||||
return t("service.pollOption", { actor });
|
||||
case "new_chat_title":
|
||||
return `${actor} changed the group name`;
|
||||
return t("service.titleChanged", { actor });
|
||||
case "new_chat_photo":
|
||||
return `${actor} changed the group photo`;
|
||||
return t("service.photoChanged", { actor });
|
||||
case "delete_chat_photo":
|
||||
return `${actor} removed the group photo`;
|
||||
return t("service.photoRemoved", { actor });
|
||||
default:
|
||||
return service.kind.replace(/_/g, " ") || "Service message";
|
||||
return t("service.unknown");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<script lang="ts">
|
||||
import { Popover } from "bits-ui";
|
||||
import ChatCalendar from "#lib/components/profile/ChatCalendar.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
anchor: HTMLElement | null;
|
||||
chatId: number;
|
||||
month: { month: number; year: number } | null;
|
||||
open: boolean;
|
||||
}
|
||||
|
||||
let { anchor, chatId, month, open = $bindable() }: Props = $props();
|
||||
</script>
|
||||
|
||||
<Popover.Root bind:open>
|
||||
<Popover.Portal>
|
||||
<Popover.Content
|
||||
aria-label={t("chat.calendar")}
|
||||
class="bg-menu-content calendar-popover"
|
||||
customAnchor={anchor}
|
||||
side="bottom"
|
||||
sideOffset={6}
|
||||
>
|
||||
{#key month}
|
||||
<ChatCalendar
|
||||
{chatId}
|
||||
initial={month}
|
||||
onjump={() => {
|
||||
open = false;
|
||||
}}
|
||||
/>
|
||||
{/key}
|
||||
</Popover.Content>
|
||||
</Popover.Portal>
|
||||
</Popover.Root>
|
||||
|
||||
<style lang="scss">
|
||||
:global(.calendar-popover) {
|
||||
width: min(20rem, calc(100vw - 1.5rem));
|
||||
padding: 0;
|
||||
background-color: var(--color-background);
|
||||
}
|
||||
</style>
|
||||
@@ -8,14 +8,17 @@
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { peerName } from "#lib/format/peer.js";
|
||||
import { formatPresence, isOnline } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { discover } from "#lib/stores/discover.svelte.js";
|
||||
import { withoutMessage } from "#lib/stores/feed.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
import { presence } from "#lib/stores/presence.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { goto } from "$app/navigation";
|
||||
import { page } from "$app/state";
|
||||
|
||||
interface Props {
|
||||
chatId: number;
|
||||
@@ -26,8 +29,11 @@
|
||||
const isDm = $derived(chatId > 0);
|
||||
const chat = $derived(chats.byId(chatId));
|
||||
const discovered = $derived(discover.get(chatId));
|
||||
const DONE_DURATION = 2500;
|
||||
|
||||
let peer = $state<PeerView | null>(null);
|
||||
let backfilling = $state(false);
|
||||
let backfilled = $state(false);
|
||||
|
||||
async function backfill() {
|
||||
if (backfilling) {
|
||||
@@ -36,14 +42,27 @@
|
||||
backfilling = true;
|
||||
try {
|
||||
await enqueueBackfill(chatId, true);
|
||||
toasts.success("Догружаем новые сообщения");
|
||||
backfilled = true;
|
||||
setTimeout(() => {
|
||||
backfilled = false;
|
||||
}, DONE_DURATION);
|
||||
} catch {
|
||||
toasts.error("Не удалось запустить бэкфилл");
|
||||
toasts.error(t("chat.backfill.failed"));
|
||||
} finally {
|
||||
backfilling = false;
|
||||
}
|
||||
}
|
||||
|
||||
function back() {
|
||||
if (page.state.inApp) {
|
||||
history.back();
|
||||
return;
|
||||
}
|
||||
const target = new URL(page.url.href);
|
||||
target.pathname = "/app";
|
||||
goto(withoutMessage(target));
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
if (accounts.selectedId === null) {
|
||||
return;
|
||||
@@ -82,7 +101,9 @@
|
||||
const fallbackTitle = $derived(
|
||||
chat?.title ??
|
||||
discovered?.title ??
|
||||
(isDm ? "Удалённый аккаунт" : `Chat ${chatId}`)
|
||||
(isDm
|
||||
? t("chat.deletedAccount")
|
||||
: t("chat.fallbackTitle", { id: chatId }))
|
||||
);
|
||||
const title = $derived(isDm && peer ? peerName(peer) : fallbackTitle);
|
||||
const subtitle = $derived.by(() => {
|
||||
@@ -97,9 +118,11 @@
|
||||
}
|
||||
const count = chat?.message_count ?? discovered?.message_count ?? 0;
|
||||
if (count > 0) {
|
||||
return `${count} messages`;
|
||||
return t("chat.messages", { count });
|
||||
}
|
||||
return discovered?.kind === "channel" ? "channel" : "group";
|
||||
return discovered?.kind === "channel"
|
||||
? t("chat.kind.channel")
|
||||
: t("chat.kind.group");
|
||||
});
|
||||
const avatarKind = $derived(isDm ? "peer" : "chat");
|
||||
const hasAvatar = $derived(
|
||||
@@ -114,8 +137,8 @@
|
||||
<header class="chat-header">
|
||||
<div class="back">
|
||||
<Button
|
||||
aria-label="Назад"
|
||||
onclick={() => goto("/app")}
|
||||
aria-label={t("common.back")}
|
||||
onclick={back}
|
||||
round
|
||||
smaller
|
||||
variant="translucent"
|
||||
@@ -129,7 +152,7 @@
|
||||
})}
|
||||
<button
|
||||
{...props}
|
||||
aria-label="Открыть профиль"
|
||||
aria-label={t("chat.openProfile")}
|
||||
class="peek"
|
||||
onclick={() => ui.openPanel("profile")}
|
||||
type="button"
|
||||
@@ -157,23 +180,36 @@
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="info" onselect={() => ui.openPanel("profile")}
|
||||
>Открыть профиль</ContextMenuItem
|
||||
>{t("chat.openProfile")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="recent" onselect={() => ui.openPanel("changes")}
|
||||
>{t("feed.changes")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="stats" onselect={() => ui.openPanel("presence")}
|
||||
>{t("chat.analytics")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem
|
||||
icon={backfilled ? "check" : "cloud-download"}
|
||||
onselect={backfill}
|
||||
>{backfilled
|
||||
? t("chat.backfill.started")
|
||||
: t("chat.backfill")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem
|
||||
icon="play-story"
|
||||
onselect={() => ui.openPanel("stories")}
|
||||
>Сторис</ContextMenuItem
|
||||
>{t("settings.stories")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem
|
||||
icon="settings"
|
||||
onselect={() => policyUi.edit({ chatId }, title)}
|
||||
>Политика захвата</ContextMenuItem
|
||||
>{t("settings.policy")}</ContextMenuItem
|
||||
>
|
||||
{/snippet}
|
||||
</ContextMenu>
|
||||
<div class="actions">
|
||||
<Button
|
||||
aria-label="Поиск в чате"
|
||||
aria-label={t("chat.search")}
|
||||
onclick={() => ui.openPanel("search")}
|
||||
round
|
||||
smaller
|
||||
@@ -182,7 +218,17 @@
|
||||
<Icon name="search" />
|
||||
</Button>
|
||||
<Button
|
||||
aria-label="Аналитика"
|
||||
aria-label={t("feed.changes")}
|
||||
class="wide-only"
|
||||
onclick={() => ui.openPanel("changes")}
|
||||
round
|
||||
smaller
|
||||
variant="translucent"
|
||||
>
|
||||
<Icon name="recent" />
|
||||
</Button>
|
||||
<Button
|
||||
aria-label={t("chat.analytics")}
|
||||
onclick={() => ui.openPanel("presence")}
|
||||
round
|
||||
smaller
|
||||
@@ -191,14 +237,16 @@
|
||||
<Icon name="stats" />
|
||||
</Button>
|
||||
<Button
|
||||
aria-label="Догрузить новые сообщения"
|
||||
aria-label={backfilled ? t("chat.backfill.started") : t("chat.backfill")}
|
||||
class="wide-only"
|
||||
loading={backfilling}
|
||||
onclick={backfill}
|
||||
round
|
||||
smaller
|
||||
title={backfilled ? t("chat.backfill.started") : t("chat.backfill")}
|
||||
variant="translucent"
|
||||
>
|
||||
<Icon name="cloud-download" />
|
||||
<Icon name={backfilled ? "check" : "cloud-download"} />
|
||||
</Button>
|
||||
</div>
|
||||
</header>
|
||||
@@ -250,6 +298,12 @@
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
margin-left: auto;
|
||||
|
||||
@media (max-width: 600px) {
|
||||
:global(.wide-only) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
@@ -262,8 +316,13 @@
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text-secondary);
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
&.online {
|
||||
color: var(--color-primary);
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
<script lang="ts">
|
||||
import { untrack } from "svelte";
|
||||
import ChatListItem from "#lib/components/ChatListItem.svelte";
|
||||
import FeedRow from "#lib/components/feed/FeedRow.svelte";
|
||||
import EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
import Skeleton from "#lib/components/ui/Skeleton.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { folders } from "#lib/stores/folders.svelte.js";
|
||||
@@ -46,7 +48,7 @@
|
||||
return;
|
||||
}
|
||||
untrack(() => folders.load()).catch(() =>
|
||||
toasts.error("Failed to load folders")
|
||||
toasts.error(t("chats.foldersFailed"))
|
||||
);
|
||||
});
|
||||
|
||||
@@ -60,7 +62,7 @@
|
||||
scrollTop = 0;
|
||||
}
|
||||
untrack(() => chats.load(folderId)).catch(() =>
|
||||
toasts.error("Failed to load chats")
|
||||
toasts.error(t("chats.loadFailed"))
|
||||
);
|
||||
});
|
||||
|
||||
@@ -74,6 +76,27 @@
|
||||
}
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
const id = activeChatId;
|
||||
untrack(() => {
|
||||
const index = list.findIndex((chat) => chat.chat_id === id);
|
||||
if (index === -1 || viewport === null) {
|
||||
return;
|
||||
}
|
||||
const row = viewport.querySelector<HTMLElement>(".Chat.selected");
|
||||
if (row) {
|
||||
row.scrollIntoView({ block: "nearest" });
|
||||
return;
|
||||
}
|
||||
const top = index * rowHeight;
|
||||
if (top < viewport.scrollTop) {
|
||||
viewport.scrollTop = top;
|
||||
} else if (top + rowHeight > viewport.scrollTop + viewport.clientHeight) {
|
||||
viewport.scrollTop = top + rowHeight - viewport.clientHeight;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function measure(el: HTMLElement) {
|
||||
({ scrollTop } = el);
|
||||
if (el.scrollTop + el.clientHeight >= el.scrollHeight - SCROLL_THRESHOLD) {
|
||||
@@ -99,6 +122,9 @@
|
||||
bind:this={viewport}
|
||||
bind:clientHeight={viewportHeight}
|
||||
>
|
||||
{#if folders.selectedId === null}
|
||||
<FeedRow />
|
||||
{/if}
|
||||
{#if chats.loading && list.length === 0}
|
||||
{#each skeletonRows as index (index)}
|
||||
<div class="row-skeleton">
|
||||
@@ -113,8 +139,10 @@
|
||||
<EmptyState
|
||||
description={folders.selectedId === null
|
||||
? undefined
|
||||
: "No chats match this folder yet"}
|
||||
title={folders.selectedId === null ? "No chats yet" : "Empty folder"}
|
||||
: t("chats.emptyFolderHint")}
|
||||
title={folders.selectedId === null
|
||||
? t("chats.empty")
|
||||
: t("chats.emptyFolder")}
|
||||
/>
|
||||
{:else}
|
||||
<div style:padding-bottom="{padBottom}px" style:padding-top="{padTop}px">
|
||||
|
||||
@@ -4,8 +4,11 @@
|
||||
import Avatar from "#lib/components/ui/Avatar.svelte";
|
||||
import ContextMenu from "#lib/components/ui/ContextMenu.svelte";
|
||||
import ContextMenuItem from "#lib/components/ui/ContextMenuItem.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatListDate } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { online } from "#lib/stores/online.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
import { type RightPanel, ui } from "#lib/stores/ui.svelte.js";
|
||||
@@ -26,8 +29,18 @@
|
||||
|
||||
const title = $derived(
|
||||
chat.title ??
|
||||
(chat.chat_id > 0 ? "Удалённый аккаунт" : `Chat ${chat.chat_id}`)
|
||||
(chat.chat_id > 0
|
||||
? t("chat.deletedAccount")
|
||||
: t("chat.fallbackTitle", { id: chat.chat_id }))
|
||||
);
|
||||
const person = $derived(chat.chat_id > 0 && !chat.is_bot);
|
||||
const isOnline = $derived(person && online.isOnline(chat.chat_id));
|
||||
|
||||
$effect(() => {
|
||||
if (person) {
|
||||
online.watch(chat.chat_id);
|
||||
}
|
||||
});
|
||||
const avatarKind = $derived(chat.chat_id > 0 ? "peer" : "chat");
|
||||
const ownId = $derived(accounts.selected?.tg_user_id ?? null);
|
||||
const showSender = $derived(
|
||||
@@ -45,7 +58,7 @@
|
||||
return "";
|
||||
}
|
||||
if (chat.last_sender_id === ownId) {
|
||||
return "You: ";
|
||||
return `${t("chat.you")}: `;
|
||||
}
|
||||
const peer = peers.get(chat.last_sender_id as number);
|
||||
if (!peer) {
|
||||
@@ -55,7 +68,7 @@
|
||||
});
|
||||
|
||||
const preview = $derived(
|
||||
chat.last_text ?? (chat.message_count > 0 ? "Media" : "")
|
||||
chat.last_text ?? (chat.message_count > 0 ? t("chat.media") : "")
|
||||
);
|
||||
</script>
|
||||
|
||||
@@ -71,12 +84,14 @@
|
||||
class:selected
|
||||
use:ripple
|
||||
>
|
||||
<Avatar
|
||||
avatar={{ id: chat.chat_id, kind: avatarKind }}
|
||||
colorKey={chat.chat_id}
|
||||
hasAvatar={chat.has_avatar}
|
||||
name={title}
|
||||
/>
|
||||
<span class="avatar" class:online={isOnline}>
|
||||
<Avatar
|
||||
avatar={{ id: chat.chat_id, kind: avatarKind }}
|
||||
colorKey={chat.chat_id}
|
||||
hasAvatar={chat.has_avatar}
|
||||
name={title}
|
||||
/>
|
||||
</span>
|
||||
<div class="info">
|
||||
<div class="info-row">
|
||||
<h3 class="title">{title}</h3>
|
||||
@@ -87,7 +102,13 @@
|
||||
{#if senderPrefix}
|
||||
<span class="sender">{senderPrefix}</span>
|
||||
{/if}
|
||||
{preview}
|
||||
{#if chat.last_deleted}
|
||||
<span class="deleted-mark" title={t("chat.deletedPreview")}
|
||||
><Icon name="delete" size="1rem" /></span
|
||||
><s class="deleted-text">{preview}</s>
|
||||
{:else}
|
||||
{preview}
|
||||
{/if}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -95,24 +116,27 @@
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="open-in-new-tab" onselect={onclick}
|
||||
>Открыть</ContextMenuItem
|
||||
>{t("chat.open")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="info" onselect={() => openWith("profile")}
|
||||
>Профиль</ContextMenuItem
|
||||
>{t("chat.profile")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="search" onselect={() => openWith("search")}
|
||||
>Поиск в чате</ContextMenuItem
|
||||
>{t("chat.search")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="recent" onselect={() => openWith("changes")}
|
||||
>{t("feed.changes")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="stats" onselect={() => openWith("presence")}
|
||||
>Аналитика</ContextMenuItem
|
||||
>{t("chat.analytics")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="play-story" onselect={() => openWith("stories")}
|
||||
>Сторис</ContextMenuItem
|
||||
>{t("settings.stories")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem
|
||||
icon="settings"
|
||||
onselect={() => policyUi.edit({ chatId: chat.chat_id }, title)}
|
||||
>Политика захвата</ContextMenuItem
|
||||
>{t("settings.policy")}</ContextMenuItem
|
||||
>
|
||||
{/snippet}
|
||||
</ContextMenu>
|
||||
@@ -141,11 +165,15 @@
|
||||
|
||||
@media (hover: hover) {
|
||||
&:hover {
|
||||
--online-ring: var(--color-chat-hover);
|
||||
|
||||
background-color: var(--color-chat-hover);
|
||||
}
|
||||
}
|
||||
|
||||
&.selected {
|
||||
--online-ring: var(--color-chat-active);
|
||||
|
||||
background-color: var(--color-chat-active);
|
||||
|
||||
.title,
|
||||
@@ -157,6 +185,37 @@
|
||||
}
|
||||
}
|
||||
|
||||
.avatar {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
|
||||
&.online::after {
|
||||
content: "";
|
||||
|
||||
position: absolute;
|
||||
right: 0.0625rem;
|
||||
bottom: 0.0625rem;
|
||||
|
||||
width: 0.875rem;
|
||||
height: 0.875rem;
|
||||
border: 2px solid var(--online-ring, var(--color-background));
|
||||
border-radius: 50%;
|
||||
|
||||
background-color: var(--color-green);
|
||||
}
|
||||
}
|
||||
|
||||
.deleted-mark {
|
||||
display: inline-flex;
|
||||
margin-inline-end: 0.1875rem;
|
||||
vertical-align: -0.1875rem;
|
||||
}
|
||||
|
||||
.deleted-text {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
.info {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
|
||||
@@ -8,14 +8,16 @@
|
||||
jumboEmojiCount,
|
||||
linkHref,
|
||||
} from "#lib/format/entities.js";
|
||||
import { markText } from "#lib/format/search.js";
|
||||
|
||||
interface Props {
|
||||
entities: EntityView[];
|
||||
marks?: string[];
|
||||
own?: boolean;
|
||||
text: string;
|
||||
}
|
||||
|
||||
let { text, entities, own = false }: Props = $props();
|
||||
let { text, entities, marks = [], own = false }: Props = $props();
|
||||
|
||||
const nodes = $derived(buildEntityTree(text, entities));
|
||||
const jumbo = $derived(entities.length === 0 ? jumboEmojiCount(text) : 0);
|
||||
@@ -32,13 +34,29 @@
|
||||
)}
|
||||
{#each items as node, i (i)}
|
||||
{#if node.kind === "text"}
|
||||
{node.text}
|
||||
{@render plain(node.text)}
|
||||
{:else}
|
||||
{@render entity(node)}
|
||||
{/if}
|
||||
{/each}
|
||||
{/snippet}
|
||||
|
||||
{#snippet plain(
|
||||
value: string
|
||||
)}
|
||||
{#if marks.length === 0}
|
||||
{value}
|
||||
{:else}
|
||||
{#each markText(value, marks) as segment, i (i)}
|
||||
{#if segment.hit}
|
||||
<mark class="found" class:own>{segment.text}</mark>
|
||||
{:else}
|
||||
{segment.text}
|
||||
{/if}
|
||||
{/each}
|
||||
{/if}
|
||||
{/snippet}
|
||||
|
||||
{#snippet entity(
|
||||
node: EntityNode
|
||||
)}
|
||||
@@ -186,6 +204,35 @@
|
||||
background-color: var(--color-primary-tint);
|
||||
}
|
||||
|
||||
.found {
|
||||
padding: 0;
|
||||
border-radius: 0.25rem;
|
||||
color: inherit;
|
||||
background-color: transparent;
|
||||
animation: found-flash 3s ease;
|
||||
|
||||
--found-color: color-mix(in srgb, var(--color-primary) 40%, transparent);
|
||||
|
||||
&.own {
|
||||
--found-color: color-mix(
|
||||
in srgb,
|
||||
var(--color-own-links) 35%,
|
||||
transparent
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes found-flash {
|
||||
0%,
|
||||
70% {
|
||||
background-color: var(--found-color);
|
||||
}
|
||||
|
||||
100% {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.spoiler {
|
||||
cursor: pointer;
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import ContextMenu from "#lib/components/ui/ContextMenu.svelte";
|
||||
import ContextMenuItem from "#lib/components/ui/ContextMenuItem.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { folders } from "#lib/stores/folders.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
|
||||
@@ -10,7 +11,7 @@
|
||||
}
|
||||
|
||||
const tabs = $derived<Tab[]>([
|
||||
{ id: null, title: "All Chats" },
|
||||
{ id: null, title: t("folders.all") },
|
||||
...folders.list.map((folder) => ({
|
||||
id: folder.folder_id,
|
||||
title: folder.title,
|
||||
@@ -93,7 +94,7 @@
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="settings" onselect={() => editPolicy(tab)}>
|
||||
Политика захвата
|
||||
{t("settings.policy")}
|
||||
</ContextMenuItem>
|
||||
{/snippet}
|
||||
</ContextMenu>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { ForwardView } from "#lib/api/types.js";
|
||||
import { peerName } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -14,20 +15,20 @@
|
||||
);
|
||||
const name = $derived.by(() => {
|
||||
if (forward.kind === "channel") {
|
||||
return forward.chat_title ?? "Channel";
|
||||
return forward.chat_title ?? t("forward.channel");
|
||||
}
|
||||
if (forward.kind === "hidden") {
|
||||
return forward.from_name ?? "Hidden account";
|
||||
return forward.from_name ?? t("forward.hidden");
|
||||
}
|
||||
if (peer) {
|
||||
return peerName(peer);
|
||||
}
|
||||
return forward.from_name ?? "Unknown";
|
||||
return forward.from_name ?? t("forward.unknown");
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="ForwardHeader">
|
||||
<span class="label">Forwarded from</span>
|
||||
<span class="label">{t("forward.from")}</span>
|
||||
<span class="name">{name}</span>
|
||||
{#if forward.signature}
|
||||
<span class="signature">({forward.signature})</span>
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
<script lang="ts">
|
||||
import { tick } from "svelte";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { search } from "#lib/stores/search.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { goto } from "$app/navigation";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const EDITABLE = "input, textarea, select, [contenteditable='true']";
|
||||
const LAYERS = "[role='dialog'], [role='alertdialog'], [role='menu']";
|
||||
|
||||
const chatId = $derived(
|
||||
page.params.chatId ? Number(page.params.chatId) : null
|
||||
);
|
||||
|
||||
async function focusIn(selector: string) {
|
||||
await tick();
|
||||
document.querySelector<HTMLInputElement>(selector)?.focus();
|
||||
}
|
||||
|
||||
async function focusSearch() {
|
||||
if (ui.leftView === "settings") {
|
||||
ui.closeSettings();
|
||||
}
|
||||
await focusIn("#LeftColumn .left-header input");
|
||||
}
|
||||
|
||||
function stepChat(step: number) {
|
||||
const { list } = chats;
|
||||
const index = list.findIndex((chat) => chat.chat_id === chatId);
|
||||
if (index === -1 && step < 0) {
|
||||
return;
|
||||
}
|
||||
const target = index === -1 ? list[0] : list[index + step];
|
||||
if (target) {
|
||||
goto(`/app/${target.chat_id}`);
|
||||
}
|
||||
}
|
||||
|
||||
function closeTop(editable: HTMLElement | null) {
|
||||
if (editable) {
|
||||
if (editable.closest("#LeftColumn .left-header")) {
|
||||
search.close();
|
||||
}
|
||||
editable.blur();
|
||||
} else if (ui.rightPanel !== null) {
|
||||
ui.closePanel();
|
||||
} else if (ui.leftView === "settings") {
|
||||
ui.closeSettings();
|
||||
} else if (chatId !== null) {
|
||||
goto("/app");
|
||||
}
|
||||
}
|
||||
|
||||
function onCommand(event: KeyboardEvent): boolean {
|
||||
const key = event.key.toLowerCase();
|
||||
if (key === "k") {
|
||||
focusSearch();
|
||||
return true;
|
||||
}
|
||||
if (key === "f" && chatId !== null) {
|
||||
ui.openPanel("search");
|
||||
focusIn("#RightColumn input");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function onPlain(event: KeyboardEvent): boolean {
|
||||
if (event.key === "/" && !event.altKey) {
|
||||
focusSearch();
|
||||
return true;
|
||||
}
|
||||
if (
|
||||
event.altKey &&
|
||||
(event.key === "ArrowUp" || event.key === "ArrowDown")
|
||||
) {
|
||||
stepChat(event.key === "ArrowUp" ? -1 : 1);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function onkeydown(event: KeyboardEvent) {
|
||||
if (event.defaultPrevented || document.querySelector(LAYERS)) {
|
||||
return;
|
||||
}
|
||||
const target = event.target as HTMLElement | null;
|
||||
const editable = target?.closest<HTMLElement>(EDITABLE) ?? null;
|
||||
const modified = event.ctrlKey || event.metaKey;
|
||||
if (event.key === "Escape") {
|
||||
closeTop(editable);
|
||||
return;
|
||||
}
|
||||
const handled = modified
|
||||
? !event.altKey && onCommand(event)
|
||||
: editable === null && onPlain(event);
|
||||
if (handled) {
|
||||
event.preventDefault();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window {onkeydown} />
|
||||
@@ -1,12 +1,15 @@
|
||||
<script lang="ts">
|
||||
import type { InlineButton } from "#lib/api/types.js";
|
||||
import { buttonHasMark } from "#lib/format/search.js";
|
||||
import { safeHref } from "#lib/format/url.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
marks?: string[];
|
||||
rows: InlineButton[][];
|
||||
}
|
||||
|
||||
let { rows }: Props = $props();
|
||||
let { marks = [], rows }: Props = $props();
|
||||
|
||||
let copied = $state<string | null>(null);
|
||||
let resetTimer: ReturnType<typeof setTimeout> | undefined;
|
||||
@@ -26,12 +29,14 @@
|
||||
<div class="row">
|
||||
{#each row as button, colIndex (colIndex)}
|
||||
{@const key = `${rowIndex}:${colIndex}`}
|
||||
{@const lit = marks.length > 0 && buttonHasMark(button, marks)}
|
||||
{#if button.kind === "url" && button.url}
|
||||
<a
|
||||
class="button"
|
||||
href={safeHref(button.url)}
|
||||
rel="noopener"
|
||||
target="_blank"
|
||||
class:found={lit}
|
||||
>
|
||||
<span class="label">{button.text}</span>
|
||||
<span class="corner">↗</span>
|
||||
@@ -41,13 +46,14 @@
|
||||
class="button"
|
||||
onclick={() => copy(key, button.data ?? "")}
|
||||
type="button"
|
||||
class:found={lit}
|
||||
>
|
||||
<span class="label"
|
||||
>{copied === key ? "Скопировано" : button.text}</span
|
||||
>{copied === key ? t("inline.copied") : button.text}</span
|
||||
>
|
||||
</button>
|
||||
{:else}
|
||||
<span class="button static">
|
||||
<span class="button static" class:found={lit}>
|
||||
<span class="label">{button.text}</span>
|
||||
</span>
|
||||
{/if}
|
||||
@@ -103,6 +109,27 @@
|
||||
}
|
||||
}
|
||||
|
||||
.found {
|
||||
animation: found-flash 3s ease;
|
||||
}
|
||||
|
||||
@keyframes found-flash {
|
||||
0%,
|
||||
70% {
|
||||
background-color: color-mix(
|
||||
in srgb,
|
||||
var(--color-primary) 30%,
|
||||
var(--color-message-reaction)
|
||||
);
|
||||
box-shadow: inset 0 0 0 1px var(--color-primary);
|
||||
}
|
||||
|
||||
100% {
|
||||
background-color: var(--color-message-reaction);
|
||||
box-shadow: inset 0 0 0 1px transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.label {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { auth } from "#lib/stores/auth.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
@@ -20,7 +21,7 @@
|
||||
await accounts.load();
|
||||
await goto("/app");
|
||||
} catch {
|
||||
toasts.error("Invalid token");
|
||||
toasts.error(t("login.invalid"));
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -33,16 +34,17 @@
|
||||
<Icon name="lock" size="2.75rem" />
|
||||
</div>
|
||||
<h1>Beavergram</h1>
|
||||
<p class="subtitle">Enter your access token to continue.</p>
|
||||
<p class="subtitle">{t("login.subtitle")}</p>
|
||||
<input
|
||||
aria-label={t("login.token")}
|
||||
autocomplete="current-password"
|
||||
class="form-control"
|
||||
placeholder="Access token"
|
||||
placeholder={t("login.token")}
|
||||
type="password"
|
||||
bind:value
|
||||
>
|
||||
<Button disabled={busy || !value.trim()} loading={busy} type="submit">
|
||||
Log in
|
||||
{t("login.submit")}
|
||||
</Button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -5,10 +5,12 @@
|
||||
import AddAccountDialog from "#lib/components/settings/AddAccountDialog.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { captureLine } from "#lib/format/capture.js";
|
||||
import { accountName } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { capture } from "#lib/stores/capture.svelte.js";
|
||||
import { theme } from "#lib/stores/theme.svelte.js";
|
||||
import { type RightPanel, ui } from "#lib/stores/ui.svelte.js";
|
||||
|
||||
@@ -23,6 +25,7 @@
|
||||
const entries: Entry[] = [
|
||||
{ icon: "eye", label: "settings.watches", panel: "watches" },
|
||||
{ icon: "unmute", label: "settings.alerts", panel: "alerts" },
|
||||
{ icon: "note", label: "notes.title", panel: "notes" },
|
||||
{ icon: "data", label: "settings.storage", panel: "storage" },
|
||||
{ icon: "play-story", label: "settings.stories", panel: "stories-all" },
|
||||
{ icon: "cloud-download", label: "settings.jobs", panel: "jobs" },
|
||||
@@ -31,6 +34,12 @@
|
||||
|
||||
let adding = $state(false);
|
||||
|
||||
const quiet = $derived(
|
||||
capture.status !== null && !capture.status.live
|
||||
? captureLine(capture.status, accounts.selected?.is_bot ?? false)
|
||||
: null
|
||||
);
|
||||
|
||||
function onkeydown(event: KeyboardEvent) {
|
||||
const match = DIGIT.exec(event.code);
|
||||
if (!(event.altKey && match)) {
|
||||
@@ -54,14 +63,18 @@
|
||||
<span class="menu-trigger">
|
||||
<Button
|
||||
{...props}
|
||||
aria-label={t("menu.open")}
|
||||
aria-label={quiet ? `${t("menu.open")}. ${quiet}` : t("menu.open")}
|
||||
round
|
||||
smaller
|
||||
title={quiet ?? undefined}
|
||||
variant="translucent"
|
||||
>
|
||||
<Icon name="menu" />
|
||||
</Button>
|
||||
<AlertBadge />
|
||||
{#if quiet}
|
||||
<span class="capture-dot"></span>
|
||||
{/if}
|
||||
</span>
|
||||
{/snippet}
|
||||
</DropdownMenu.Trigger>
|
||||
@@ -142,6 +155,21 @@
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.capture-dot {
|
||||
pointer-events: none;
|
||||
|
||||
position: absolute;
|
||||
right: 0.125rem;
|
||||
bottom: 0.125rem;
|
||||
|
||||
width: 0.625rem;
|
||||
height: 0.625rem;
|
||||
border-radius: 50%;
|
||||
|
||||
background-color: var(--color-error);
|
||||
box-shadow: 0 0 0 2px var(--color-background);
|
||||
}
|
||||
|
||||
:global(.main-menu) {
|
||||
width: 17rem;
|
||||
max-height: calc(100dvh - 5rem);
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatBytes, mediaKindLabel } from "#lib/format/media.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { poster } from "#lib/media/poster.js";
|
||||
import { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { shareUi } from "#lib/stores/shares.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
@@ -48,6 +50,7 @@
|
||||
let loading = $state(false);
|
||||
let saving = $state(false);
|
||||
let token = 0;
|
||||
const queued = createFlash<number>();
|
||||
|
||||
const mime = $derived(result?.state === "ready" ? (result.mime ?? "") : "");
|
||||
const isImage = $derived(mime.startsWith("image/") || kind === "photo");
|
||||
@@ -61,7 +64,9 @@
|
||||
const canSave = $derived(
|
||||
currentMediaId !== null && (fileOnly || result?.state === "ready")
|
||||
);
|
||||
const title = $derived(fileName ?? mediaKindLabel(kind) ?? "Медиа");
|
||||
const title = $derived(
|
||||
fileName ?? mediaKindLabel(kind) ?? t("media.kind.other")
|
||||
);
|
||||
const caption = $derived(items[index]?.caption);
|
||||
|
||||
function revoke() {
|
||||
@@ -124,7 +129,7 @@
|
||||
}
|
||||
} catch {
|
||||
if (current === token) {
|
||||
toasts.error("Failed to load media");
|
||||
toasts.error(t("media.loadFailed"));
|
||||
}
|
||||
} finally {
|
||||
if (current === token) {
|
||||
@@ -137,11 +142,12 @@
|
||||
if (messageId === null) {
|
||||
return;
|
||||
}
|
||||
const target = messageId;
|
||||
try {
|
||||
await fetchMedia(chatId, messageId);
|
||||
toasts.success("Скачивание поставлено в очередь");
|
||||
await fetchMedia(chatId, target);
|
||||
queued.show(target);
|
||||
} catch {
|
||||
toasts.error("Не удалось поставить в очередь");
|
||||
toasts.error(t("media.queueFailed"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,7 +159,7 @@
|
||||
try {
|
||||
await downloadMedia(currentMediaId);
|
||||
} catch {
|
||||
toasts.error("Не удалось скачать файл");
|
||||
toasts.error(t("ui.downloadFailed"));
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -225,7 +231,7 @@
|
||||
{#if canSave}
|
||||
{#if ontrash}
|
||||
<button
|
||||
aria-label="В корзину"
|
||||
aria-label={t("storage.toTrash")}
|
||||
class="media-action"
|
||||
onclick={trash}
|
||||
type="button"
|
||||
@@ -239,7 +245,7 @@
|
||||
})}
|
||||
<button
|
||||
{...props}
|
||||
aria-label="Скачать файл"
|
||||
aria-label={t("ui.downloadFile")}
|
||||
class="media-action"
|
||||
onclick={save}
|
||||
type="button"
|
||||
@@ -249,15 +255,15 @@
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="download" onselect={save}>
|
||||
Скачать файл
|
||||
{t("ui.downloadFile")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="allow-share" onselect={share}>
|
||||
Доступ по ссылке
|
||||
{t("ui.shareLink")}
|
||||
</ContextMenuItem>
|
||||
{/snippet}
|
||||
</ContextMenu>
|
||||
<button
|
||||
aria-label="Доступ по ссылке"
|
||||
aria-label={t("ui.shareLink")}
|
||||
class="media-action"
|
||||
onclick={share}
|
||||
type="button"
|
||||
@@ -265,7 +271,7 @@
|
||||
<Icon name="allow-share" size="1.375rem" />
|
||||
</button>
|
||||
{/if}
|
||||
<Dialog.Close aria-label="Закрыть" class="media-close">
|
||||
<Dialog.Close aria-label={t("common.close")} class="media-close">
|
||||
<Icon name="close" size="1.5rem" />
|
||||
</Dialog.Close>
|
||||
</div>
|
||||
@@ -276,7 +282,7 @@
|
||||
{#if loading}
|
||||
<Spinner color="white" />
|
||||
{:else if result?.state === "ready" && isImage}
|
||||
<img alt={kind} class="media-image" src={result.url}>
|
||||
<img alt={title} class="media-image" src={result.url}>
|
||||
{:else if result?.state === "ready" && isVideo}
|
||||
<!-- svelte-ignore a11y_media_has_caption -->
|
||||
<!-- biome-ignore lint/a11y/useMediaCaption: archived media has no captions -->
|
||||
@@ -301,24 +307,29 @@
|
||||
{#if currentMediaId !== null}
|
||||
<button class="media-download" onclick={save} type="button">
|
||||
<Icon name="download" />
|
||||
Скачать файл
|
||||
{t("ui.downloadFile")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
{:else if result?.state === "not-downloaded"}
|
||||
<div class="media-message">
|
||||
<p>Файл ещё не скачан в архив.</p>
|
||||
<p>{t("media.notDownloaded")}</p>
|
||||
<Button fluid onclick={queueFetch} variant="primary">
|
||||
Скачать в архив
|
||||
{#if queued.current === messageId}
|
||||
<Icon name="check" />
|
||||
{t("chat.media.queued")}
|
||||
{:else}
|
||||
{t("media.downloadToArchive")}
|
||||
{/if}
|
||||
</Button>
|
||||
</div>
|
||||
{:else if result?.state === "missing"}
|
||||
<p class="media-message">Файл не найден.</p>
|
||||
<p class="media-message">{t("media.missing")}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{#if hasNav}
|
||||
<button
|
||||
aria-label="Previous"
|
||||
aria-label={t("ui.previous")}
|
||||
class="media-nav prev"
|
||||
disabled={index === 0}
|
||||
onclick={() => step(-1)}
|
||||
@@ -327,7 +338,7 @@
|
||||
<Icon name="previous" size="1.75rem" />
|
||||
</button>
|
||||
<button
|
||||
aria-label="Next"
|
||||
aria-label={t("ui.next")}
|
||||
class="media-nav next"
|
||||
disabled={index === items.length - 1}
|
||||
onclick={() => step(1)}
|
||||
@@ -397,6 +408,11 @@
|
||||
|
||||
font-size: 0.9375rem;
|
||||
color: var(--color-white);
|
||||
|
||||
@media (max-width: 600px) {
|
||||
top: auto;
|
||||
bottom: 1.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
:global(.media-close) {
|
||||
|
||||
@@ -15,19 +15,24 @@
|
||||
import Avatar from "#lib/components/ui/Avatar.svelte";
|
||||
import ContextMenu from "#lib/components/ui/ContextMenu.svelte";
|
||||
import ContextMenuItem from "#lib/components/ui/ContextMenuItem.svelte";
|
||||
import CopyItem from "#lib/components/ui/CopyItem.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import WebPage from "#lib/components/WebPage.svelte";
|
||||
import { accountName, peerColorIndex, peerName } from "#lib/format/peer.js";
|
||||
import { buttonHasMark, hasMark } from "#lib/format/search.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { notes } from "#lib/stores/notes.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { appear } from "#lib/transitions/appear.js";
|
||||
import { goto } from "$app/navigation";
|
||||
|
||||
interface Props {
|
||||
animate: boolean;
|
||||
firstInGroup: boolean;
|
||||
highlighted: boolean;
|
||||
highlight: string[] | null;
|
||||
isGroupChat: boolean;
|
||||
lastInGroup: boolean;
|
||||
message: MessageView;
|
||||
@@ -43,7 +48,7 @@
|
||||
isGroupChat,
|
||||
firstInGroup,
|
||||
lastInGroup,
|
||||
highlighted,
|
||||
highlight,
|
||||
animate,
|
||||
onjump,
|
||||
onmedia,
|
||||
@@ -51,6 +56,14 @@
|
||||
}: Props = $props();
|
||||
|
||||
const deleted = $derived(message.deleted_at !== null);
|
||||
const marks = $derived(highlight ?? []);
|
||||
const markedInside = $derived(
|
||||
marks.length > 0 &&
|
||||
(hasMark(message.text, marks) ||
|
||||
message.inline_buttons.some((row) =>
|
||||
row.some((button) => buttonHasMark(button, marks))
|
||||
))
|
||||
);
|
||||
const hasText = $derived(Boolean(message.text));
|
||||
const special = $derived(
|
||||
Boolean(
|
||||
@@ -59,27 +72,47 @@
|
||||
);
|
||||
|
||||
const ownId = $derived(accounts.selected?.tg_user_id ?? null);
|
||||
const senderChat = $derived(
|
||||
message.sender_id !== null && message.sender_id < 0
|
||||
? message.sender_id
|
||||
: null
|
||||
);
|
||||
const sender = $derived(
|
||||
message.sender_id === null ? undefined : peers.get(message.sender_id)
|
||||
message.sender_id === null || senderChat !== null
|
||||
? undefined
|
||||
: peers.get(message.sender_id)
|
||||
);
|
||||
const senderName = $derived.by(() => {
|
||||
if (own) {
|
||||
return accounts.selected ? accountName(accounts.selected) : "You";
|
||||
return accounts.selected ? accountName(accounts.selected) : t("chat.you");
|
||||
}
|
||||
if (senderChat !== null) {
|
||||
return chats.byId(senderChat)?.title ?? "";
|
||||
}
|
||||
if (sender) {
|
||||
return peerName(sender);
|
||||
}
|
||||
return message.sender_id === null ? "" : String(message.sender_id);
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
if (senderChat !== null) {
|
||||
chats.ensure(senderChat);
|
||||
}
|
||||
});
|
||||
const colorIndex = $derived(peerColorIndex(message.sender_id ?? 0));
|
||||
const showName = $derived(isGroupChat && !own && firstInGroup);
|
||||
|
||||
const avatarId = $derived(own ? ownId : message.sender_id);
|
||||
const avatarHas = $derived(
|
||||
own
|
||||
? ownId !== null && peers.get(ownId)?.has_avatar
|
||||
: (sender?.has_avatar ?? false)
|
||||
);
|
||||
const avatarHas = $derived.by(() => {
|
||||
if (own) {
|
||||
return ownId !== null && Boolean(peers.get(ownId)?.has_avatar);
|
||||
}
|
||||
if (senderChat !== null) {
|
||||
return chats.byId(senderChat)?.has_avatar ?? false;
|
||||
}
|
||||
return sender?.has_avatar ?? false;
|
||||
});
|
||||
|
||||
const hasCallbacks = $derived(
|
||||
message.inline_buttons.some((row) =>
|
||||
@@ -114,16 +147,15 @@
|
||||
onjump(message.reply.message_id);
|
||||
}
|
||||
}
|
||||
async function copyText() {
|
||||
await navigator.clipboard.writeText(message.text ?? "");
|
||||
toasts.success("Текст скопирован");
|
||||
}
|
||||
async function copyId() {
|
||||
await navigator.clipboard.writeText(String(message.message_id));
|
||||
toasts.success("ID скопирован");
|
||||
function messageLink(): string {
|
||||
return `${location.origin}/app/${message.chat_id}?message=${message.message_id}`;
|
||||
}
|
||||
function openSenderProfile() {
|
||||
if (message.sender_id !== null) {
|
||||
if (senderChat === message.chat_id) {
|
||||
ui.openPanel("profile");
|
||||
} else if (senderChat !== null) {
|
||||
goto(`/app/${senderChat}`);
|
||||
} else if (message.sender_id !== null) {
|
||||
ui.openPerson(message.chat_id, message.sender_id);
|
||||
}
|
||||
}
|
||||
@@ -139,7 +171,7 @@
|
||||
data-message-id={message.message_id}
|
||||
class:deleted
|
||||
class:first-in-group={firstInGroup}
|
||||
class:highlighted
|
||||
class:highlighted={highlight !== null && !markedInside}
|
||||
class:last-in-group={lastInGroup}
|
||||
class:own
|
||||
class:with-avatar={isGroupChat}
|
||||
@@ -155,7 +187,10 @@
|
||||
type="button"
|
||||
>
|
||||
<Avatar
|
||||
avatar={{ id: avatarId, kind: "peer" }}
|
||||
avatar={{
|
||||
id: avatarId,
|
||||
kind: senderChat === null ? "peer" : "chat",
|
||||
}}
|
||||
colorKey={avatarId}
|
||||
hasAvatar={avatarHas}
|
||||
name={senderName}
|
||||
@@ -182,12 +217,6 @@
|
||||
{#if message.reply}
|
||||
<ReplyHeader {onjump} reply={message.reply} />
|
||||
{/if}
|
||||
{#if deleted}
|
||||
<span class="deleted-tag">
|
||||
<Icon name="delete" size="0.875rem" />
|
||||
deleted
|
||||
</span>
|
||||
{/if}
|
||||
{#if message.poll}
|
||||
<Poll poll={message.poll} />
|
||||
{/if}
|
||||
@@ -206,19 +235,26 @@
|
||||
{own}
|
||||
/>
|
||||
{:else if message.has_media}
|
||||
<MessageMedia {message} onopen={() => onmedia(0)} {own} />
|
||||
<MessageMedia
|
||||
items={menu}
|
||||
{message}
|
||||
onopen={() => onmedia(0)}
|
||||
{onversions}
|
||||
{own}
|
||||
/>
|
||||
{/if}
|
||||
{/if}
|
||||
{#if hasText}
|
||||
<div class="text">
|
||||
<EntityText
|
||||
entities={message.entities}
|
||||
{marks}
|
||||
{own}
|
||||
text={message.text ?? ""}
|
||||
/>
|
||||
</div>
|
||||
{:else if !(message.has_media || deleted || special)}
|
||||
<div class="text empty">(no text)</div>
|
||||
<div class="text empty">{t("feed.noText")}</div>
|
||||
{/if}
|
||||
{#if message.web_page}
|
||||
<WebPage {message} {onmedia} {own} />
|
||||
@@ -233,18 +269,23 @@
|
||||
{#if linkCount > 0}
|
||||
<button class="detail-chip" onclick={openLinks} type="button">
|
||||
<Icon name="link" size="0.875rem" />
|
||||
{linkCount}
|
||||
{linkCount === 1 ? "ссылка" : "ссылки"}
|
||||
{t("thread.links", { count: linkCount })}
|
||||
</button>
|
||||
{/if}
|
||||
<MessageMeta {message} {onversions} {own} />
|
||||
<MessageMeta
|
||||
{message}
|
||||
noted={notes.has(message)}
|
||||
onnote={openAnnotations}
|
||||
{onversions}
|
||||
{own}
|
||||
/>
|
||||
{#if message.inline_buttons.length}
|
||||
<InlineButtons rows={message.inline_buttons} />
|
||||
<InlineButtons {marks} rows={message.inline_buttons} />
|
||||
{/if}
|
||||
{#if hasCallbacks}
|
||||
<button class="detail-chip" onclick={openCallbacks} type="button">
|
||||
<Icon name="bot-command" size="0.875rem" />
|
||||
Callback-данные
|
||||
{t("panel.callbacks")}
|
||||
</button>
|
||||
{/if}
|
||||
{#if lastInGroup}
|
||||
@@ -263,42 +304,56 @@
|
||||
<MessageReadItem {message} />
|
||||
{/if}
|
||||
<ContextMenuItem icon="note" onselect={openAnnotations}
|
||||
>Заметки</ContextMenuItem
|
||||
>{t("panel.annotations")}</ContextMenuItem
|
||||
>
|
||||
{#if message.reactions.length}
|
||||
<ContextMenuItem icon="heart" onselect={openReactions}
|
||||
>Реакции</ContextMenuItem
|
||||
>{t("panel.reactions")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{#if linkCount > 0}
|
||||
<ContextMenuItem icon="link" onselect={openLinks}>Ссылки</ContextMenuItem>
|
||||
<ContextMenuItem icon="link" onselect={openLinks}
|
||||
>{t("panel.links")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{#if hasCallbacks}
|
||||
<ContextMenuItem icon="bot-command" onselect={openCallbacks}
|
||||
>Callback-данные</ContextMenuItem
|
||||
>{t("panel.callbacks")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{#if message.edited_at}
|
||||
<ContextMenuItem icon="edit" onselect={onversions}
|
||||
>Версии</ContextMenuItem
|
||||
>{t("panel.versions")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{#if (message.reply?.message_id ?? null) !== null}
|
||||
<ContextMenuItem icon="reply" onselect={jumpToReply}
|
||||
>Перейти к ответу</ContextMenuItem
|
||||
>{t("thread.toReply")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
<CopyItem
|
||||
done={t("chat.menu.linkCopied")}
|
||||
icon="link"
|
||||
label={t("chat.menu.copyLink")}
|
||||
text={messageLink}
|
||||
/>
|
||||
{#if hasText}
|
||||
<ContextMenuItem icon="copy" onselect={copyText}
|
||||
>Копировать текст</ContextMenuItem
|
||||
>
|
||||
<CopyItem
|
||||
done={t("chat.menu.copied")}
|
||||
icon="copy"
|
||||
label={t("thread.copyText")}
|
||||
text={() => message.text ?? ""}
|
||||
/>
|
||||
{/if}
|
||||
<ContextMenuItem icon="hashtag" onselect={copyId}
|
||||
>Копировать ID</ContextMenuItem
|
||||
>
|
||||
<CopyItem
|
||||
done={t("chat.menu.copied")}
|
||||
icon="hashtag"
|
||||
label={t("thread.copyId")}
|
||||
text={() => String(message.message_id)}
|
||||
/>
|
||||
{#if isGroupChat && !own && message.sender_id !== null}
|
||||
<ContextMenuItem icon="info" onselect={openSenderProfile}
|
||||
>Профиль автора</ContextMenuItem
|
||||
>{t("thread.senderProfile")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{/snippet}
|
||||
@@ -423,17 +478,6 @@
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
.deleted-tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
|
||||
margin-bottom: 0.25rem;
|
||||
|
||||
font-size: 0.75rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-error);
|
||||
}
|
||||
|
||||
.detail-chip {
|
||||
display: inline-flex;
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<script lang="ts">
|
||||
import { tick, untrack } from "svelte";
|
||||
import type { CaptureGap } from "#lib/api/capture.js";
|
||||
import { listMessages } from "#lib/api/endpoints.js";
|
||||
import { type ViewerItem, viewerItemsFrom } from "#lib/api/media.js";
|
||||
import type { LiveEvent, MessageView } from "#lib/api/types.js";
|
||||
import ActionMessage from "#lib/components/ActionMessage.svelte";
|
||||
import CalendarPopover from "#lib/components/CalendarPopover.svelte";
|
||||
import MediaViewer from "#lib/components/MediaViewer.svelte";
|
||||
import MessageBubble from "#lib/components/MessageBubble.svelte";
|
||||
import MessageVersions from "#lib/components/MessageVersions.svelte";
|
||||
@@ -11,8 +13,12 @@
|
||||
import TrackChat from "#lib/components/TrackChat.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatDay } from "#lib/format/datetime.js";
|
||||
import { formatDay, formatSpanRange } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { capture } from "#lib/stores/capture.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { discover } from "#lib/stores/discover.svelte.js";
|
||||
import { events } from "#lib/stores/events.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
@@ -31,6 +37,8 @@
|
||||
const STICK_OFFSET = 9;
|
||||
const IDLE_DELAY = 1500;
|
||||
const MAX_MESSAGES = 360;
|
||||
const SETTLE_DELAY = 400;
|
||||
const HIGHLIGHT_MS = 3000;
|
||||
|
||||
let messages = $state<MessageView[]>([]);
|
||||
let loading = $state(true);
|
||||
@@ -42,6 +50,7 @@
|
||||
let suppressAppear = $state(false);
|
||||
let scrolling = $state(false);
|
||||
let stuckDay = $state<string | null>(null);
|
||||
let passedDays = $state.raw(new Set<string>());
|
||||
let idleTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
let mediaOpen = $state(false);
|
||||
@@ -49,16 +58,25 @@
|
||||
let mediaIndex = $state(0);
|
||||
let versionsOpen = $state(false);
|
||||
let versionsMessageId = $state<number | null>(null);
|
||||
let highlightId = $state<number | null>(null);
|
||||
let highlight = $state<{ id: number; marks: string[] } | null>(null);
|
||||
let calendarOpen = $state(false);
|
||||
let calendarAnchor = $state<HTMLElement | null>(null);
|
||||
let calendarMonth = $state<{ month: number; year: number } | null>(null);
|
||||
let highlightTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
const ownId = $derived(accounts.selected?.tg_user_id ?? null);
|
||||
const isGroupChat = $derived(chatId < 0);
|
||||
const isChannel = $derived(
|
||||
Boolean(chats.byId(chatId)?.is_broadcast) ||
|
||||
discover.get(chatId)?.kind === "channel"
|
||||
);
|
||||
const isGroupChat = $derived(chatId < 0 && !isChannel);
|
||||
|
||||
interface Row {
|
||||
dayKey: string;
|
||||
daySeparator: string | null;
|
||||
firstInGroup: boolean;
|
||||
gapsAfter: CaptureGap[];
|
||||
gapsBefore: CaptureGap[];
|
||||
lastInGroup: boolean;
|
||||
message: MessageView;
|
||||
own: boolean;
|
||||
@@ -68,6 +86,27 @@
|
||||
return new Date(iso).toDateString();
|
||||
}
|
||||
|
||||
const gapSpans = $derived(
|
||||
capture.gaps.map((gap) => ({
|
||||
day: dayKey(gap.start),
|
||||
end: Date.parse(gap.end),
|
||||
gap,
|
||||
start: Date.parse(gap.start),
|
||||
}))
|
||||
);
|
||||
|
||||
function gapsBetween(
|
||||
prev: MessageView | undefined,
|
||||
message: MessageView
|
||||
): typeof gapSpans {
|
||||
if (!prev || gapSpans.length === 0) {
|
||||
return [];
|
||||
}
|
||||
const from = Date.parse(prev.date);
|
||||
const to = Date.parse(message.date);
|
||||
return gapSpans.filter((span) => span.start >= from && span.end <= to);
|
||||
}
|
||||
|
||||
const rows = $derived.by<Row[]>(() => {
|
||||
const out: Row[] = [];
|
||||
for (let i = 0; i < messages.length; i += 1) {
|
||||
@@ -75,15 +114,28 @@
|
||||
const prev = messages[i - 1];
|
||||
const next = messages[i + 1];
|
||||
const day = dayKey(message.date);
|
||||
const gaps = gapsBetween(prev, message);
|
||||
const samePrevDay = prev ? dayKey(prev.date) === day : false;
|
||||
const sameNextDay = next ? dayKey(next.date) === day : false;
|
||||
out.push({
|
||||
dayKey: day,
|
||||
daySeparator: samePrevDay ? null : formatDay(message.date),
|
||||
firstInGroup:
|
||||
!prev || prev.sender_id !== message.sender_id || !samePrevDay,
|
||||
!prev ||
|
||||
prev.sender_id !== message.sender_id ||
|
||||
!samePrevDay ||
|
||||
gaps.length > 0,
|
||||
gapsAfter: gaps
|
||||
.filter((span) => span.day === day)
|
||||
.map((span) => span.gap),
|
||||
gapsBefore: gaps
|
||||
.filter((span) => span.day !== day)
|
||||
.map((span) => span.gap),
|
||||
lastInGroup:
|
||||
!next || next.sender_id !== message.sender_id || !sameNextDay,
|
||||
!next ||
|
||||
next.sender_id !== message.sender_id ||
|
||||
!sameNextDay ||
|
||||
gapsBetween(message, next).length > 0,
|
||||
message,
|
||||
own: ownId !== null && message.sender_id === ownId,
|
||||
});
|
||||
@@ -117,22 +169,91 @@
|
||||
peers.ensure(ids);
|
||||
}
|
||||
|
||||
function jumpToMessage(messageId: number) {
|
||||
function memberIds(message: MessageView): number[] {
|
||||
return [message.message_id, ...message.media.map((ref) => ref.message_id)];
|
||||
}
|
||||
|
||||
function holds(message: MessageView, messageId: number): boolean {
|
||||
return memberIds(message).includes(messageId);
|
||||
}
|
||||
|
||||
function sameAlbum(a: MessageView, b: MessageView): boolean {
|
||||
return (
|
||||
a.media_group_id !== null &&
|
||||
a.media_group_id === b.media_group_id &&
|
||||
a.chat_id === b.chat_id
|
||||
);
|
||||
}
|
||||
|
||||
function albumPrimary(base: MessageView, incoming: MessageView) {
|
||||
if (
|
||||
base.message_id === incoming.message_id ||
|
||||
(incoming.text && !base.text)
|
||||
) {
|
||||
return incoming;
|
||||
}
|
||||
if (base.text) {
|
||||
return base;
|
||||
}
|
||||
return incoming.message_id < base.message_id ? incoming : base;
|
||||
}
|
||||
|
||||
function joinAlbum(base: MessageView, incoming: MessageView): MessageView {
|
||||
const media = new Map(base.media.map((ref) => [ref.message_id, ref]));
|
||||
for (const ref of incoming.media) {
|
||||
media.set(ref.message_id, ref);
|
||||
}
|
||||
return {
|
||||
...albumPrimary(base, incoming),
|
||||
media: [...media.values()].sort((a, b) => a.message_id - b.message_id),
|
||||
};
|
||||
}
|
||||
|
||||
function mergeAlbums(list: MessageView[]): MessageView[] {
|
||||
const out: MessageView[] = [];
|
||||
for (const message of list) {
|
||||
const prev = out.at(-1);
|
||||
if (prev && sameAlbum(prev, message)) {
|
||||
out[out.length - 1] = joinAlbum(prev, message);
|
||||
} else {
|
||||
out.push(message);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
function knownIds(): Set<number> {
|
||||
return new Set(messages.flatMap(memberIds));
|
||||
}
|
||||
|
||||
function ownerOf(messageId: number): number | null {
|
||||
return messages.find((m) => holds(m, messageId))?.message_id ?? null;
|
||||
}
|
||||
|
||||
function jumpToMessage(
|
||||
messageId: number,
|
||||
smooth = true,
|
||||
marks: string[] = []
|
||||
) {
|
||||
const owner = ownerOf(messageId) ?? messageId;
|
||||
const target = container?.querySelector<HTMLElement>(
|
||||
`[data-message-id="${messageId}"]`
|
||||
`[data-message-id="${owner}"]`
|
||||
);
|
||||
if (!target) {
|
||||
toasts.error("Message not loaded");
|
||||
toasts.error(t("thread.notFound"));
|
||||
return;
|
||||
}
|
||||
target.scrollIntoView({ behavior: "smooth", block: "center" });
|
||||
highlightId = messageId;
|
||||
target.scrollIntoView({
|
||||
behavior: smooth ? "smooth" : "auto",
|
||||
block: "center",
|
||||
});
|
||||
highlight = { id: owner, marks };
|
||||
if (highlightTimer) {
|
||||
clearTimeout(highlightTimer);
|
||||
}
|
||||
highlightTimer = setTimeout(() => {
|
||||
highlightId = null;
|
||||
}, 1600);
|
||||
highlight = null;
|
||||
}, HIGHLIGHT_MS);
|
||||
}
|
||||
|
||||
function scrollToBottom() {
|
||||
@@ -147,33 +268,43 @@
|
||||
}
|
||||
const limit = container.getBoundingClientRect().top + STICK_OFFSET + 1;
|
||||
const seps = container.querySelectorAll<HTMLElement>(".day-separator");
|
||||
let day: string | null = null;
|
||||
const stuck: string[] = [];
|
||||
for (const sep of seps) {
|
||||
if (sep.getBoundingClientRect().top <= limit) {
|
||||
day = sep.dataset.day ?? null;
|
||||
if (sep.getBoundingClientRect().top <= limit && sep.dataset.day) {
|
||||
stuck.push(sep.dataset.day);
|
||||
}
|
||||
}
|
||||
stuckDay = day;
|
||||
stuckDay = stuck.pop() ?? null;
|
||||
passedDays = new Set(stuck);
|
||||
}
|
||||
|
||||
async function loadInitial() {
|
||||
loading = true;
|
||||
hasMore = true;
|
||||
hasNewer = false;
|
||||
const pending = ui.jumpTarget?.chatId === chatId ? ui.jumpTarget : null;
|
||||
try {
|
||||
if (pending) {
|
||||
ui.clearJump();
|
||||
await loadAround(pending.messageId);
|
||||
await tick();
|
||||
jumpToMessage(pending.messageId, false, pending.marks);
|
||||
return;
|
||||
}
|
||||
const page = await listMessages(chatId, {
|
||||
include_deleted: true,
|
||||
limit: PAGE,
|
||||
offset: 0,
|
||||
});
|
||||
messages = [...page].reverse();
|
||||
messages = mergeAlbums([...page].reverse());
|
||||
hasMore = page.length > 0;
|
||||
ensurePeers(messages);
|
||||
await tick();
|
||||
scrollToBottom();
|
||||
updateStuck();
|
||||
setTimeout(updateStuck, SETTLE_DELAY);
|
||||
} catch {
|
||||
toasts.error("Failed to load messages");
|
||||
toasts.error(t("thread.loadFailed"));
|
||||
} finally {
|
||||
loading = false;
|
||||
}
|
||||
@@ -215,16 +346,18 @@
|
||||
const prevTop = el.scrollTop;
|
||||
try {
|
||||
const page = await listMessages(chatId, {
|
||||
before_id: messages[0].message_id,
|
||||
before_id: Math.min(...memberIds(messages[0])),
|
||||
include_deleted: true,
|
||||
limit: PAGE,
|
||||
});
|
||||
const known = new Set(messages.map((m) => m.message_id));
|
||||
const fresh = page.filter((m) => !known.has(m.message_id));
|
||||
const known = knownIds();
|
||||
const fresh = page.filter((m) =>
|
||||
memberIds(m).some((id) => !known.has(id))
|
||||
);
|
||||
hasMore = fresh.length > 0;
|
||||
if (fresh.length > 0) {
|
||||
suppressAppear = true;
|
||||
messages = [...[...fresh].reverse(), ...messages];
|
||||
messages = mergeAlbums([...[...fresh].reverse(), ...messages]);
|
||||
ensurePeers(fresh);
|
||||
await tick();
|
||||
el.scrollTop = prevTop + (el.scrollHeight - prevHeight);
|
||||
@@ -242,17 +375,20 @@
|
||||
}
|
||||
loadingNewer = true;
|
||||
try {
|
||||
const last = messages.at(-1);
|
||||
const page = await listMessages(chatId, {
|
||||
after_id: messages.at(-1)?.message_id,
|
||||
after_id: last ? Math.max(...memberIds(last)) : undefined,
|
||||
include_deleted: true,
|
||||
limit: PAGE,
|
||||
});
|
||||
const known = new Set(messages.map((m) => m.message_id));
|
||||
const fresh = page.filter((m) => !known.has(m.message_id));
|
||||
const known = knownIds();
|
||||
const fresh = page.filter((m) =>
|
||||
memberIds(m).some((id) => !known.has(id))
|
||||
);
|
||||
hasNewer = fresh.length > 0;
|
||||
if (fresh.length > 0) {
|
||||
suppressAppear = true;
|
||||
messages = [...messages, ...fresh];
|
||||
messages = mergeAlbums([...messages, ...fresh]);
|
||||
ensurePeers(fresh);
|
||||
await tick();
|
||||
await trimHead();
|
||||
@@ -278,7 +414,7 @@
|
||||
limit: PAGE,
|
||||
}),
|
||||
]);
|
||||
messages = [...[...older].reverse(), ...newer];
|
||||
messages = mergeAlbums([...[...older].reverse(), ...newer]);
|
||||
hasMore = older.length > 0;
|
||||
hasNewer = newer.length > 0;
|
||||
ensurePeers(messages);
|
||||
@@ -309,6 +445,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
function openCalendar(event: MouseEvent, iso: string) {
|
||||
const date = new Date(iso);
|
||||
calendarAnchor = event.currentTarget as HTMLElement;
|
||||
calendarMonth = { month: date.getUTCMonth(), year: date.getUTCFullYear() };
|
||||
calendarOpen = true;
|
||||
}
|
||||
|
||||
function openMedia(message: MessageView, index: number) {
|
||||
mediaItems = viewerItemsFrom(message.message_id, message.media);
|
||||
mediaIndex = index;
|
||||
@@ -331,13 +474,20 @@
|
||||
}
|
||||
|
||||
function replaceMessage(message: MessageView) {
|
||||
messages = messages.map((m) =>
|
||||
m.message_id === message.message_id ? message : m
|
||||
);
|
||||
messages = messages.map((m) => {
|
||||
if (sameAlbum(m, message)) {
|
||||
return joinAlbum(m, message);
|
||||
}
|
||||
return m.message_id === message.message_id ? message : m;
|
||||
});
|
||||
}
|
||||
|
||||
async function appendMessage(message: MessageView) {
|
||||
if (messages.some((m) => m.message_id === message.message_id)) {
|
||||
const last = messages.at(-1);
|
||||
if (
|
||||
messages.some((m) => holds(m, message.message_id)) ||
|
||||
(last && sameAlbum(last, message))
|
||||
) {
|
||||
replaceMessage(message);
|
||||
return;
|
||||
}
|
||||
@@ -357,7 +507,7 @@
|
||||
function applyDelete(ids: number[]) {
|
||||
const now = new Date().toISOString();
|
||||
messages = messages.map((m) =>
|
||||
ids.includes(m.message_id) && m.deleted_at === null
|
||||
m.deleted_at === null && ids.some((id) => holds(m, id))
|
||||
? { ...m, deleted_at: now }
|
||||
: m
|
||||
);
|
||||
@@ -403,20 +553,24 @@
|
||||
});
|
||||
const fresh = [...page].reverse();
|
||||
const known = new Map(messages.map((m) => [m.message_id, m]));
|
||||
const maxId = messages.reduce((acc, m) => Math.max(acc, m.message_id), 0);
|
||||
const maxId = Math.max(0, ...messages.flatMap(memberIds));
|
||||
const stick = isNearBottom();
|
||||
const appended: MessageView[] = [];
|
||||
for (const message of fresh) {
|
||||
if (known.has(message.message_id)) {
|
||||
known.set(message.message_id, message);
|
||||
const current = known.get(message.message_id);
|
||||
if (current) {
|
||||
known.set(
|
||||
message.message_id,
|
||||
sameAlbum(current, message) ? joinAlbum(current, message) : message
|
||||
);
|
||||
} else if (message.message_id > maxId) {
|
||||
appended.push(message);
|
||||
}
|
||||
}
|
||||
messages = [
|
||||
messages = mergeAlbums([
|
||||
...messages.map((m) => known.get(m.message_id) ?? m),
|
||||
...appended,
|
||||
];
|
||||
]);
|
||||
ensurePeers(fresh);
|
||||
await trimHead();
|
||||
if (appended.length > 0 && stick) {
|
||||
@@ -425,12 +579,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function jumpToTarget(messageId: number) {
|
||||
if (!messages.some((m) => m.message_id === messageId)) {
|
||||
await loadAround(messageId);
|
||||
async function goTo(messageId: number, marks: string[] = []) {
|
||||
try {
|
||||
const loaded = ownerOf(messageId) !== null;
|
||||
if (!loaded) {
|
||||
await loadAround(messageId);
|
||||
}
|
||||
await tick();
|
||||
jumpToMessage(messageId, loaded, marks);
|
||||
} catch {
|
||||
toasts.error(t("thread.loadFailed"));
|
||||
}
|
||||
await tick();
|
||||
jumpToMessage(messageId);
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
@@ -439,7 +598,7 @@
|
||||
return;
|
||||
}
|
||||
ui.clearJump();
|
||||
jumpToTarget(target.messageId);
|
||||
goTo(target.messageId, target.marks);
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
@@ -460,7 +619,7 @@
|
||||
</script>
|
||||
|
||||
<div class="message-pane">
|
||||
<PinnedBar {chatId} onjump={jumpToMessage} />
|
||||
<PinnedBar {chatId} onjump={goTo} />
|
||||
<div
|
||||
class="message-list custom-scroll"
|
||||
onscroll={onScroll}
|
||||
@@ -480,26 +639,42 @@
|
||||
<div class="loading-older"><Spinner /></div>
|
||||
{/if}
|
||||
{#each rows as row (row.message.message_id)}
|
||||
{#each row.gapsBefore as gap (gap.start)}
|
||||
{@render gapLine(gap)}
|
||||
{/each}
|
||||
{#if row.daySeparator}
|
||||
<div
|
||||
class="day-separator"
|
||||
data-day={row.dayKey}
|
||||
class:idle={!scrolling && row.dayKey === stuckDay}
|
||||
class:passed={passedDays.has(row.dayKey)}
|
||||
>
|
||||
<span>{row.daySeparator}</span>
|
||||
<button
|
||||
aria-label={t("chat.calendar")}
|
||||
onclick={(event) => openCalendar(event, row.message.date)}
|
||||
title={t("chat.calendar")}
|
||||
type="button"
|
||||
>
|
||||
{row.daySeparator}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
{#each row.gapsAfter as gap (gap.start)}
|
||||
{@render gapLine(gap)}
|
||||
{/each}
|
||||
{#if row.message.service}
|
||||
<ActionMessage message={row.message} onjump={jumpToMessage} />
|
||||
<ActionMessage message={row.message} onjump={goTo} />
|
||||
{:else}
|
||||
<MessageBubble
|
||||
animate={!suppressAppear}
|
||||
firstInGroup={row.firstInGroup}
|
||||
highlighted={highlightId === row.message.message_id}
|
||||
highlight={highlight?.id === row.message.message_id
|
||||
? highlight.marks
|
||||
: null}
|
||||
{isGroupChat}
|
||||
lastInGroup={row.lastInGroup}
|
||||
message={row.message}
|
||||
onjump={jumpToMessage}
|
||||
onjump={goTo}
|
||||
onmedia={(index) => openMedia(row.message, index)}
|
||||
onversions={() => openVersions(row.message.message_id)}
|
||||
own={row.own}
|
||||
@@ -514,7 +689,7 @@
|
||||
</div>
|
||||
{#if hasNewer}
|
||||
<button
|
||||
aria-label="К последним сообщениям"
|
||||
aria-label={t("thread.toLatest")}
|
||||
class="to-latest"
|
||||
onclick={goToLatest}
|
||||
type="button"
|
||||
@@ -524,6 +699,20 @@
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#snippet gapLine(
|
||||
gap: CaptureGap
|
||||
)}
|
||||
<div class="capture-gap">
|
||||
<span>{t("chat.gap", { range: formatSpanRange(gap.start, gap.end) })}</span>
|
||||
</div>
|
||||
{/snippet}
|
||||
|
||||
<CalendarPopover
|
||||
anchor={calendarAnchor}
|
||||
{chatId}
|
||||
month={calendarMonth}
|
||||
bind:open={calendarOpen}
|
||||
/>
|
||||
<MediaViewer
|
||||
{chatId}
|
||||
items={mediaItems}
|
||||
@@ -613,10 +802,15 @@
|
||||
justify-content: center;
|
||||
margin: 0.75rem 0;
|
||||
|
||||
span {
|
||||
button {
|
||||
pointer-events: auto;
|
||||
cursor: pointer;
|
||||
|
||||
padding: 0.25rem 0.75rem;
|
||||
border: 0;
|
||||
border-radius: 1rem;
|
||||
|
||||
font: inherit;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-white);
|
||||
@@ -624,10 +818,39 @@
|
||||
background-color: var(--color-default-shadow);
|
||||
backdrop-filter: blur(8px);
|
||||
transition: opacity 0.3s ease;
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
&.idle span {
|
||||
&.idle button,
|
||||
&.passed button {
|
||||
pointer-events: none;
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.capture-gap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
|
||||
margin: 0.75rem 0;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text-secondary);
|
||||
|
||||
&::before,
|
||||
&::after {
|
||||
content: "";
|
||||
flex: 1;
|
||||
border-top: 1px dashed var(--color-borders);
|
||||
}
|
||||
|
||||
span {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,4 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { ContextMenu as Menu } from "bits-ui";
|
||||
import type { Snippet } from "svelte";
|
||||
import { visible } from "#lib/actions/visible.js";
|
||||
import { downloadMedia } from "#lib/api/download.js";
|
||||
import { fetchMedia } from "#lib/api/endpoints.js";
|
||||
@@ -14,24 +16,25 @@
|
||||
import TgsSticker from "#lib/components/media/TgsSticker.svelte";
|
||||
import VideoNote from "#lib/components/media/VideoNote.svelte";
|
||||
import VoiceMessage from "#lib/components/media/VoiceMessage.svelte";
|
||||
import MessageReadItem from "#lib/components/read/MessageReadItem.svelte";
|
||||
import ContextMenu from "#lib/components/ui/ContextMenu.svelte";
|
||||
import ContextMenuItem from "#lib/components/ui/ContextMenuItem.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatBytes, mediaKindLabel } from "#lib/format/media.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { poster } from "#lib/media/poster.js";
|
||||
import { shareUi } from "#lib/stores/shares.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
|
||||
interface Props {
|
||||
items?: Snippet;
|
||||
message: MessageView;
|
||||
onopen: () => void;
|
||||
onversions?: () => void;
|
||||
own: boolean;
|
||||
}
|
||||
|
||||
let { message, onopen, own }: Props = $props();
|
||||
let { items, message, onopen, onversions, own }: Props = $props();
|
||||
|
||||
const POLL_TRIES = 5;
|
||||
const POLL_DELAY = 3000;
|
||||
@@ -39,6 +42,7 @@
|
||||
let loaded = $state(false);
|
||||
let media = $state<InlineMedia | null>(null);
|
||||
let queuing = $state(false);
|
||||
let queued = $state(false);
|
||||
let saving = $state(false);
|
||||
|
||||
const ref = $derived(message.media[0] ?? null);
|
||||
@@ -71,7 +75,10 @@
|
||||
const storedId = $derived(
|
||||
ready?.mediaId ?? (asFile ? ref?.id : null) ?? null
|
||||
);
|
||||
const fileName = $derived(ref?.file_name ?? mediaKindLabel(kind) ?? "Файл");
|
||||
const fileName = $derived(
|
||||
ref?.file_name ?? mediaKindLabel(kind) ?? t("chat.media.file")
|
||||
);
|
||||
const waiting = $derived(queuing || queued);
|
||||
|
||||
function delay(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => {
|
||||
@@ -101,16 +108,16 @@
|
||||
}
|
||||
|
||||
async function queue() {
|
||||
if (queuing) {
|
||||
if (waiting) {
|
||||
return;
|
||||
}
|
||||
queuing = true;
|
||||
try {
|
||||
await fetchMedia(message.chat_id, message.message_id);
|
||||
toasts.success("Скачивание поставлено в очередь");
|
||||
queued = true;
|
||||
poll();
|
||||
} catch {
|
||||
toasts.error("Не удалось поставить в очередь");
|
||||
toasts.error(t("chat.media.queueFailed"));
|
||||
} finally {
|
||||
queuing = false;
|
||||
}
|
||||
@@ -124,7 +131,7 @@
|
||||
try {
|
||||
await downloadMedia(storedId);
|
||||
} catch {
|
||||
toasts.error("Не удалось скачать файл");
|
||||
toasts.error(t("chat.media.downloadFailed"));
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -145,7 +152,7 @@
|
||||
{#if message.is_self_destruct}
|
||||
<button class="media-chip self-destruct" onclick={onopen} type="button">
|
||||
<Icon name="timer" size="1.25rem" />
|
||||
<span>Самоуничтожающееся медиа</span>
|
||||
<span>{t("chat.media.selfDestruct")}</span>
|
||||
</button>
|
||||
{:else if asFile && ref}
|
||||
<FileChip media={ref} {own} />
|
||||
@@ -165,11 +172,11 @@
|
||||
<AudioFile {own} title={fileName} url={ready.url} />
|
||||
{:else if ready && isImage}
|
||||
<button class="media-thumb" onclick={onopen} type="button">
|
||||
<img alt="attachment" src={ready.url}>
|
||||
<img alt={t("chat.media.photo")} src={ready.url}>
|
||||
</button>
|
||||
{:else if ready && isStaticSticker}
|
||||
<button class="media-sticker" onclick={onopen} type="button">
|
||||
<img alt="sticker" src={ready.url}>
|
||||
<img alt={fileName} src={ready.url}>
|
||||
</button>
|
||||
{:else if ready && isVideoSticker}
|
||||
<video
|
||||
@@ -205,46 +212,59 @@
|
||||
</button>
|
||||
{:else if media?.state === "not-downloaded" && vk !== "other"}
|
||||
<button class="media-placeholder" onclick={queue} type="button">
|
||||
<Icon name={queuing ? "timer" : "download"} size="1.5rem" />
|
||||
<span>{vk === "video" ? "Видео" : "Фото"}</span>
|
||||
<small>{queuing ? "В очереди" : "Нажмите, чтобы скачать"}</small>
|
||||
<Icon name={waiting ? "timer" : "download"} size="1.5rem" />
|
||||
<span
|
||||
>{vk === "video"
|
||||
? t("chat.media.video")
|
||||
: t("chat.media.photo")}</span
|
||||
>
|
||||
<small
|
||||
>{waiting
|
||||
? t("chat.media.queued")
|
||||
: t("chat.media.tapToDownload")}</small
|
||||
>
|
||||
</button>
|
||||
{:else if media?.state === "not-downloaded"}
|
||||
<button class="media-chip" onclick={queue} type="button">
|
||||
<Icon name={queuing ? "timer" : "download"} size="1.25rem" />
|
||||
<span>{queuing ? "В очереди" : `Скачать ${label}`}</span>
|
||||
<Icon name={waiting ? "timer" : "download"} size="1.25rem" />
|
||||
<span
|
||||
>{waiting
|
||||
? t("chat.media.queued")
|
||||
: t("chat.media.download", { kind: label })}</span
|
||||
>
|
||||
</button>
|
||||
{:else}
|
||||
<button class="media-chip" onclick={onopen} type="button">
|
||||
<Icon name="photo" size="1.25rem" />
|
||||
<span>Медиа</span>
|
||||
<span>{t("chat.media")}</span>
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
{#if own}
|
||||
<MessageReadItem {message} />
|
||||
{/if}
|
||||
<ContextMenuItem icon="open-in-new-tab" onselect={onopen}
|
||||
>Открыть на весь экран</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem
|
||||
icon="recent"
|
||||
onselect={() => ui.openMessagePanel("versions", message.message_id)}
|
||||
>Версии медиа</ContextMenuItem
|
||||
>{t("chat.media.fullscreen")}</ContextMenuItem
|
||||
>
|
||||
{#if onversions}
|
||||
<ContextMenuItem icon="recent" onselect={onversions}
|
||||
>{t("chat.media.versions")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{#if storedId === null}
|
||||
<ContextMenuItem icon="cloud-download" onselect={queue}>
|
||||
Скачать в архив
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="cloud-download" onselect={queue}
|
||||
>{t("chat.media.queue")}</ContextMenuItem
|
||||
>
|
||||
{:else}
|
||||
<ContextMenuItem icon="download" onselect={save}>
|
||||
Скачать файл
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="allow-share" onselect={share}>
|
||||
Доступ по ссылке
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="download" onselect={save}
|
||||
>{t("chat.media.save")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="allow-share" onselect={share}
|
||||
>{t("chat.media.share")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{#if items}
|
||||
<Menu.Separator class="bg-menu-separator" />
|
||||
{@render items()}
|
||||
{/if}
|
||||
{/snippet}
|
||||
</ContextMenu>
|
||||
|
||||
@@ -1,30 +1,86 @@
|
||||
<script lang="ts">
|
||||
import type { MessageView } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatTime } from "#lib/format/datetime.js";
|
||||
import {
|
||||
formatExact,
|
||||
formatStamp,
|
||||
formatTime,
|
||||
} from "#lib/format/datetime.js";
|
||||
import { readTitle } from "#lib/format/read.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
message: MessageView;
|
||||
noted?: boolean;
|
||||
onnote?: () => void;
|
||||
onversions?: () => void;
|
||||
own?: boolean;
|
||||
}
|
||||
|
||||
let { message, onversions, own = false }: Props = $props();
|
||||
let {
|
||||
message,
|
||||
noted = false,
|
||||
onnote,
|
||||
onversions,
|
||||
own = false,
|
||||
}: Props = $props();
|
||||
|
||||
const TIP_DURATION = 3000;
|
||||
|
||||
let tip = $state(false);
|
||||
let tipTimer: ReturnType<typeof setTimeout> | undefined;
|
||||
|
||||
const exact = $derived(formatExact(message.date));
|
||||
|
||||
function toggleTip() {
|
||||
tip = !tip;
|
||||
clearTimeout(tipTimer);
|
||||
if (tip) {
|
||||
tipTimer = setTimeout(() => {
|
||||
tip = false;
|
||||
}, TIP_DURATION);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<span class="MessageMeta">
|
||||
{#if message.edited_at}
|
||||
{#if noted}
|
||||
<button
|
||||
class="edited"
|
||||
onclick={onversions}
|
||||
title="View edit history"
|
||||
aria-label={t("chat.note")}
|
||||
class="meta-button note"
|
||||
onclick={onnote}
|
||||
title={t("chat.note")}
|
||||
type="button"
|
||||
>
|
||||
edited
|
||||
<Icon name="note" size="1rem" />
|
||||
</button>
|
||||
{/if}
|
||||
<span class="time">{formatTime(message.date)}</span>
|
||||
{#if message.deleted_at}
|
||||
<span class="deleted" title={formatExact(message.deleted_at)}>
|
||||
{t("chat.deletedAt", { when: formatStamp(message.deleted_at) })}
|
||||
</span>
|
||||
{/if}
|
||||
{#if message.edited_at}
|
||||
<button
|
||||
class="meta-button edited"
|
||||
onclick={onversions}
|
||||
title={t("chat.editedAt", { when: formatExact(message.edited_at) })}
|
||||
type="button"
|
||||
>
|
||||
{t("chat.edited")}
|
||||
</button>
|
||||
{/if}
|
||||
<button
|
||||
class="meta-button time"
|
||||
onclick={toggleTip}
|
||||
title={exact}
|
||||
type="button"
|
||||
>
|
||||
{formatTime(message.date)}
|
||||
</button>
|
||||
{#if tip}
|
||||
<span class="tip" role="status">{exact}</span>
|
||||
{/if}
|
||||
{#if own}
|
||||
<span class="ticks" title={readTitle(message)}>
|
||||
<Icon name={message.read ? "message-read" : "check"} size="1rem" />
|
||||
@@ -34,6 +90,8 @@
|
||||
|
||||
<style lang="scss">
|
||||
.MessageMeta {
|
||||
position: relative;
|
||||
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
@@ -47,21 +105,70 @@
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.time {
|
||||
.meta-button {
|
||||
cursor: pointer;
|
||||
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
|
||||
padding: 0;
|
||||
border: 0;
|
||||
border-radius: 0.25rem;
|
||||
|
||||
font: inherit;
|
||||
color: inherit;
|
||||
white-space: nowrap;
|
||||
|
||||
background: transparent;
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 1px;
|
||||
}
|
||||
}
|
||||
|
||||
.note {
|
||||
@media (hover: hover) {
|
||||
&:hover {
|
||||
color: var(--color-primary);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.edited,
|
||||
.deleted {
|
||||
font-style: italic;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.deleted::after {
|
||||
content: "·";
|
||||
margin-inline-start: 0.25rem;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.tip {
|
||||
pointer-events: none;
|
||||
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: calc(100% + 0.375rem);
|
||||
z-index: 1;
|
||||
|
||||
padding: 0.375rem 0.625rem;
|
||||
border-radius: 0.5rem;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
font-style: normal;
|
||||
color: var(--color-white);
|
||||
white-space: nowrap;
|
||||
|
||||
background-color: var(--color-toast-background);
|
||||
backdrop-filter: blur(10px);
|
||||
box-shadow: 0 0.25rem 0.75rem var(--color-default-shadow);
|
||||
}
|
||||
|
||||
.ticks {
|
||||
display: inline-flex;
|
||||
}
|
||||
|
||||
.edited {
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
font-size: 0.75rem;
|
||||
font-style: italic;
|
||||
color: inherit;
|
||||
background: transparent;
|
||||
}
|
||||
</style>
|
||||
@@ -6,6 +6,7 @@
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatFull } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -33,7 +34,7 @@
|
||||
versions = text;
|
||||
mediaVersions = media;
|
||||
})
|
||||
.catch(() => toasts.error("Failed to load edit history"))
|
||||
.catch(() => toasts.error(t("versions.failed")))
|
||||
.finally(() => {
|
||||
loading = false;
|
||||
});
|
||||
@@ -46,8 +47,8 @@
|
||||
<Dialog.Overlay class="dialog-overlay" />
|
||||
<Dialog.Content class="dialog-content">
|
||||
<header class="dialog-head">
|
||||
<Dialog.Title class="dialog-title">Edit history</Dialog.Title>
|
||||
<Dialog.Close aria-label="Close" class="dialog-close">
|
||||
<Dialog.Title class="dialog-title">{t("versions.title")}</Dialog.Title>
|
||||
<Dialog.Close aria-label={t("common.close")} class="dialog-close">
|
||||
<Icon name="close" size="1.25rem" />
|
||||
</Dialog.Close>
|
||||
</header>
|
||||
@@ -55,11 +56,11 @@
|
||||
{#if loading}
|
||||
<div class="centered"><Spinner /></div>
|
||||
{:else if versions.length === 0 && mediaVersions.length === 0}
|
||||
<p class="empty">No versions recorded.</p>
|
||||
<p class="empty">{t("versions.none")}</p>
|
||||
{:else}
|
||||
{#if mediaVersions.length > 0}
|
||||
<div class="media-versions">
|
||||
<span class="media-label">Media versions</span>
|
||||
<span class="media-label">{t("versions.media")}</span>
|
||||
<div class="media-strip">
|
||||
{#each mediaVersions as media (media.id)}
|
||||
<MediaVersionThumb version={media} />
|
||||
@@ -70,12 +71,14 @@
|
||||
{#each versions as version, index (version.observed_at)}
|
||||
<div class="version">
|
||||
<div class="version-meta">
|
||||
<span class="version-label">Version {index + 1}</span>
|
||||
<span class="version-label"
|
||||
>{t("versions.version", { number: index + 1 })}</span
|
||||
>
|
||||
<span class="version-date"
|
||||
>{formatFull(version.observed_at)}</span
|
||||
>
|
||||
</div>
|
||||
<div class="version-text">{version.text ?? "(no text)"}</div>
|
||||
<div class="version-text">{version.text ?? t("feed.noText")}</div>
|
||||
</div>
|
||||
{/each}
|
||||
{/if}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import type { PinnedView } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { mediaKindLabel } from "#lib/format/media.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -19,7 +20,7 @@
|
||||
? (pinned.text ??
|
||||
(pinned.media_kind
|
||||
? mediaKindLabel(pinned.media_kind)
|
||||
: "Pinned message"))
|
||||
: t("pinned.message")))
|
||||
: ""
|
||||
);
|
||||
|
||||
@@ -56,7 +57,7 @@
|
||||
>
|
||||
<Icon name="pin" size="1.125rem" />
|
||||
<span class="body">
|
||||
<span class="label">Pinned message</span>
|
||||
<span class="label">{t("pinned.message")}</span>
|
||||
<span class="preview">{preview}</span>
|
||||
</span>
|
||||
</button>
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<script lang="ts">
|
||||
import AlertsPanel from "#lib/components/alerts/AlertsPanel.svelte";
|
||||
import AnnotationsPanel from "#lib/components/annotations/AnnotationsPanel.svelte";
|
||||
import NotesPanel from "#lib/components/annotations/NotesPanel.svelte";
|
||||
import BotsPanel from "#lib/components/bots/BotsPanel.svelte";
|
||||
import StoragePanel from "#lib/components/disk/StoragePanel.svelte";
|
||||
import TrashPanel from "#lib/components/disk/TrashPanel.svelte";
|
||||
import ChatChanges from "#lib/components/feed/ChatChanges.svelte";
|
||||
import JobsPanel from "#lib/components/jobs/JobsPanel.svelte";
|
||||
import PolicyEditor from "#lib/components/policy/PolicyEditor.svelte";
|
||||
import AnalyticsPanel from "#lib/components/presence/AnalyticsPanel.svelte";
|
||||
@@ -21,35 +23,38 @@
|
||||
import WatchesPanel from "#lib/components/watches/WatchesPanel.svelte";
|
||||
import WebhooksPanel from "#lib/components/watches/WebhooksPanel.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { notes } from "#lib/stores/notes.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
import { storageUi } from "#lib/stores/storage.svelte.js";
|
||||
import { type RightPanel, ui } from "#lib/stores/ui.svelte.js";
|
||||
|
||||
const titles: Record<RightPanel, string> = $derived({
|
||||
alerts: t("settings.alerts"),
|
||||
annotations: "Заметки",
|
||||
bots: "Боты",
|
||||
callbacks: "Callback-данные",
|
||||
jobs: "Бэкфилл и задачи",
|
||||
links: "Ссылки",
|
||||
policy: "Политика захвата",
|
||||
presence: "Аналитика",
|
||||
profile: "Профиль",
|
||||
reactions: "Реакции",
|
||||
readers: t("read.readers.title"),
|
||||
search: "Поиск",
|
||||
shares: "Файлы по ссылке",
|
||||
storage: "Хранилище",
|
||||
"storage-chat": "Файлы чата",
|
||||
"storage-trash": "Корзина",
|
||||
stories: "Сторис",
|
||||
"stories-all": "Все сторис",
|
||||
versions: "Версии",
|
||||
watches: t("settings.watches"),
|
||||
webhooks: t("watches.webhooks"),
|
||||
});
|
||||
const titles: Record<RightPanel, MessageKey> = {
|
||||
alerts: "settings.alerts",
|
||||
annotations: "panel.annotations",
|
||||
bots: "settings.bots",
|
||||
callbacks: "panel.callbacks",
|
||||
changes: "feed.changes",
|
||||
jobs: "settings.jobs",
|
||||
links: "panel.links",
|
||||
notes: "notes.title",
|
||||
policy: "settings.policy",
|
||||
presence: "chat.analytics",
|
||||
profile: "chat.profile",
|
||||
reactions: "panel.reactions",
|
||||
readers: "read.readers.title",
|
||||
search: "panel.search",
|
||||
shares: "settings.shares",
|
||||
storage: "settings.storage",
|
||||
"storage-chat": "panel.chatFiles",
|
||||
"storage-trash": "panel.trash",
|
||||
stories: "settings.stories",
|
||||
"stories-all": "panel.allStories",
|
||||
watches: "settings.watches",
|
||||
webhooks: "watches.webhooks",
|
||||
};
|
||||
|
||||
const parents: Partial<Record<RightPanel, RightPanel>> = {
|
||||
"storage-chat": "storage",
|
||||
@@ -62,18 +67,21 @@
|
||||
if (ui.rightPanel === null) {
|
||||
return "";
|
||||
}
|
||||
if (ui.rightPanel === "notes" && notes.tag !== null) {
|
||||
return t("notes.tag", { tag: notes.tag });
|
||||
}
|
||||
const chat =
|
||||
ui.rightPanel === "storage-chat" && storageUi.chatId !== null
|
||||
? chats.byId(storageUi.chatId)
|
||||
: undefined;
|
||||
return chat?.title ?? titles[ui.rightPanel];
|
||||
return chat?.title ?? t(titles[ui.rightPanel]);
|
||||
});
|
||||
</script>
|
||||
|
||||
<header class="right-header">
|
||||
{#if parent}
|
||||
<Button
|
||||
aria-label="Назад"
|
||||
aria-label={t("common.back")}
|
||||
onclick={() => ui.openPanel(parent)}
|
||||
round
|
||||
smaller
|
||||
@@ -83,7 +91,7 @@
|
||||
</Button>
|
||||
{:else}
|
||||
<Button
|
||||
aria-label="Закрыть"
|
||||
aria-label={t("common.close")}
|
||||
onclick={() => ui.closePanel()}
|
||||
round
|
||||
smaller
|
||||
@@ -98,6 +106,10 @@
|
||||
<div class="right-body custom-scroll">
|
||||
{#if ui.rightPanel === "profile"}
|
||||
<ProfilePanel />
|
||||
{:else if ui.rightPanel === "changes"}
|
||||
{#key accounts.selectedId}
|
||||
<ChatChanges />
|
||||
{/key}
|
||||
{:else if ui.rightPanel === "policy"}
|
||||
{#key `${accounts.selectedId}:${policyUi.revision}`}
|
||||
<PolicyEditor />
|
||||
@@ -132,6 +144,10 @@
|
||||
<AlertsPanel />
|
||||
{:else if ui.rightPanel === "annotations"}
|
||||
<AnnotationsPanel />
|
||||
{:else if ui.rightPanel === "notes"}
|
||||
{#key accounts.selectedId}
|
||||
<NotesPanel />
|
||||
{/key}
|
||||
{:else if ui.rightPanel === "shares"}
|
||||
<SharesPanel />
|
||||
{:else if ui.rightPanel === "bots"}
|
||||
|
||||
@@ -2,9 +2,11 @@
|
||||
import { enqueueBackfill, trackChat } from "#lib/api/endpoints.js";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { discover } from "#lib/stores/discover.svelte.js";
|
||||
import { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -14,10 +16,11 @@
|
||||
let { chatId }: Props = $props();
|
||||
|
||||
let busy = $state(false);
|
||||
const started = createFlash<true>();
|
||||
|
||||
const item = $derived(discover.get(chatId));
|
||||
const tracked = $derived(item?.tracked ?? false);
|
||||
const title = $derived(item?.title ?? "Этот чат");
|
||||
const title = $derived(item?.title ?? t("track.thisChat"));
|
||||
|
||||
$effect(() => {
|
||||
if (accounts.selectedId === null) {
|
||||
@@ -33,10 +36,10 @@
|
||||
busy = true;
|
||||
try {
|
||||
discover.set(await trackChat(chatId, true));
|
||||
toasts.success("Отслеживание включено, история загружается");
|
||||
started.show(true);
|
||||
chats.refresh();
|
||||
} catch {
|
||||
toasts.error("Не удалось включить отслеживание");
|
||||
toasts.error(t("track.failed"));
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -49,9 +52,9 @@
|
||||
busy = true;
|
||||
try {
|
||||
await enqueueBackfill(chatId, true, true);
|
||||
toasts.success("Полный бэкфилл запущен");
|
||||
started.show(true);
|
||||
} catch {
|
||||
toasts.error("Не удалось запустить бэкфилл");
|
||||
toasts.error(t("jobs.backfillFailed"));
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -59,26 +62,22 @@
|
||||
</script>
|
||||
|
||||
<div class="track">
|
||||
<div class="title">Здесь пока нет сообщений</div>
|
||||
<div class="title">{t("track.empty")}</div>
|
||||
<p class="description">
|
||||
{#if tracked}
|
||||
{title}
|
||||
отслеживается — новые сообщения и статистика собираются автоматически.
|
||||
{:else}
|
||||
Включите отслеживание, чтобы собирать сообщения, медиа и статистику по
|
||||
этому чату.
|
||||
{/if}
|
||||
{tracked ? t("track.tracked", { title }) : t("track.hint")}
|
||||
</p>
|
||||
<div class="actions">
|
||||
{#if tracked}
|
||||
<Button loading={busy} onclick={backfill} pill variant="secondary">
|
||||
<Icon name="cloud-download" />
|
||||
<span>Загрузить историю</span>
|
||||
<Icon name={started.current ? "check" : "cloud-download"} />
|
||||
<span
|
||||
>{started.current ? t("track.loading") : t("track.loadHistory")}</span
|
||||
>
|
||||
</Button>
|
||||
{:else}
|
||||
<Button loading={busy} onclick={track} pill variant="primary">
|
||||
<Icon name="stats" />
|
||||
<span>Начать отслеживать</span>
|
||||
<span>{t("track.start")}</span>
|
||||
</Button>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -16,12 +16,14 @@
|
||||
import { formatFull, formatListDate } from "#lib/format/datetime.js";
|
||||
import {
|
||||
alertAvatar,
|
||||
alertHref,
|
||||
alertLabel,
|
||||
alertPreview,
|
||||
alertTitle,
|
||||
EVENT_ICONS,
|
||||
} from "#lib/format/watches.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { replaceParam } from "#lib/params.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { ALERTS_PARAM, alerts } from "#lib/stores/alerts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
@@ -48,15 +50,7 @@
|
||||
);
|
||||
|
||||
function writeParam(value: Filter | null) {
|
||||
const url = new URL(page.url.href);
|
||||
if (value === null) {
|
||||
url.searchParams.delete(ALERTS_PARAM);
|
||||
} else {
|
||||
url.searchParams.set(ALERTS_PARAM, value);
|
||||
}
|
||||
if (url.href !== page.url.href) {
|
||||
goto(url, { replace: true, reset: false });
|
||||
}
|
||||
replaceParam(ALERTS_PARAM, value);
|
||||
}
|
||||
|
||||
function setFilter(next: Filter) {
|
||||
@@ -135,10 +129,10 @@
|
||||
|
||||
async function openAlert(alert: AlertItem) {
|
||||
seen(alert);
|
||||
await goto(alert.path);
|
||||
if (isMobile()) {
|
||||
ui.closePanel();
|
||||
ui.resetPanel();
|
||||
}
|
||||
await goto(alertHref(alert));
|
||||
}
|
||||
|
||||
async function seeAll() {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { untrack } from "svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import Button from "../ui/Button.svelte";
|
||||
|
||||
interface Props {
|
||||
@@ -13,7 +14,7 @@
|
||||
const {
|
||||
initial = "",
|
||||
saving = false,
|
||||
submitLabel = "Добавить заметку",
|
||||
submitLabel,
|
||||
oncancel,
|
||||
onsubmit,
|
||||
}: Props = $props();
|
||||
@@ -41,15 +42,19 @@
|
||||
}}
|
||||
>
|
||||
<textarea
|
||||
placeholder="Заметка к сообщению…"
|
||||
placeholder={t("notes.placeholder")}
|
||||
rows={oncancel ? 2 : 3}
|
||||
bind:value={text}
|
||||
></textarea>
|
||||
<div class="actions">
|
||||
{#if oncancel}
|
||||
<Button onclick={oncancel} variant="translucent">Отмена</Button>
|
||||
<Button onclick={oncancel} variant="translucent">
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
{/if}
|
||||
<Button disabled={saving || !valid} type="submit">{submitLabel}</Button>
|
||||
<Button disabled={saving || !valid} type="submit">
|
||||
{submitLabel ?? t("notes.add")}
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
<script lang="ts">
|
||||
import type { Annotation } from "#lib/api/types.js";
|
||||
import { formatFull } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import Icon from "../ui/Icon.svelte";
|
||||
import AnnotationEditor from "./AnnotationEditor.svelte";
|
||||
import NoteText from "./NoteText.svelte";
|
||||
|
||||
interface Props {
|
||||
annotations: Annotation[];
|
||||
@@ -28,14 +30,14 @@
|
||||
onupdate(annotation, text);
|
||||
editingId = null;
|
||||
}}
|
||||
submitLabel="Сохранить"
|
||||
submitLabel={t("common.save")}
|
||||
/>
|
||||
{:else}
|
||||
<p class="text">{annotation.text}</p>
|
||||
<NoteText text={annotation.text} />
|
||||
<div class="meta">
|
||||
<span class="time">{formatFull(annotation.updated_at)}</span>
|
||||
<button
|
||||
aria-label="Изменить"
|
||||
aria-label={t("notes.edit")}
|
||||
class="action"
|
||||
onclick={() => {
|
||||
editingId = annotation.id;
|
||||
@@ -45,7 +47,7 @@
|
||||
<Icon name="edit" size="1rem" />
|
||||
</button>
|
||||
<button
|
||||
aria-label="Удалить"
|
||||
aria-label={t("common.delete")}
|
||||
class="action"
|
||||
onclick={() => ondelete(annotation)}
|
||||
type="button"
|
||||
@@ -74,12 +76,6 @@
|
||||
border-radius: 0.75rem;
|
||||
}
|
||||
|
||||
.text {
|
||||
margin: 0;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
.meta {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
import type { Annotation } from "#lib/api/types.js";
|
||||
import EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { notes } from "#lib/stores/notes.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
import AnnotationEditor from "./AnnotationEditor.svelte";
|
||||
@@ -40,6 +42,7 @@
|
||||
.then((rows) => {
|
||||
if (current === token) {
|
||||
items = rows;
|
||||
notes.mark(cid, mid, rows.length > 0);
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
@@ -58,6 +61,7 @@
|
||||
try {
|
||||
const created = await createAnnotation(chatId, messageId, text);
|
||||
items = [created, ...items];
|
||||
notes.mark(chatId, messageId, true);
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -71,11 +75,12 @@
|
||||
async function remove(annotation: Annotation) {
|
||||
await deleteAnnotation(annotation.id);
|
||||
items = items.filter((item) => item.id !== annotation.id);
|
||||
notes.mark(annotation.chat_id, annotation.message_id, items.length > 0);
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if chatId === null || messageId === null}
|
||||
<EmptyState description="Сообщение не выбрано" title="Заметки" />
|
||||
<EmptyState description={t("ui.noMessage")} title={t("notes.title")} />
|
||||
{:else}
|
||||
<div class="panel-content">
|
||||
<AnnotationEditor onsubmit={add} {saving} />
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
<script lang="ts">
|
||||
import { noteParts, notes } from "#lib/stores/notes.svelte.js";
|
||||
|
||||
interface Props {
|
||||
interactive?: boolean;
|
||||
text: string;
|
||||
}
|
||||
|
||||
const { interactive = true, text }: Props = $props();
|
||||
|
||||
const parts = $derived(noteParts(text));
|
||||
|
||||
function openTag(event: MouseEvent, tag: string) {
|
||||
event.stopPropagation();
|
||||
notes.openTag(tag);
|
||||
}
|
||||
</script>
|
||||
|
||||
<p class="note-text">
|
||||
{#each parts as part, index (index)}
|
||||
{#if "tag" in part && interactive}
|
||||
<button
|
||||
class="tag"
|
||||
onclick={(event) => openTag(event, part.tag)}
|
||||
type="button"
|
||||
class:active={notes.tag === part.tag}
|
||||
>
|
||||
{part.label}
|
||||
</button>
|
||||
{:else if "tag" in part}
|
||||
<span class="tag" class:active={notes.tag === part.tag}
|
||||
>{part.label}</span
|
||||
>
|
||||
{:else}
|
||||
{part.text}
|
||||
{/if}
|
||||
{/each}
|
||||
</p>
|
||||
|
||||
<style lang="scss">
|
||||
.note-text {
|
||||
margin: 0;
|
||||
white-space: pre-wrap;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.tag {
|
||||
display: inline;
|
||||
|
||||
padding: 0 0.3125rem;
|
||||
border: 0;
|
||||
border-radius: 0.375rem;
|
||||
|
||||
font: inherit;
|
||||
font-size: 0.875em;
|
||||
color: var(--color-primary);
|
||||
|
||||
background-color: color-mix(in srgb, var(--color-primary) 12%, transparent);
|
||||
transition: background-color 0.15s ease;
|
||||
|
||||
&.active {
|
||||
box-shadow: inset 0 0 0 1px var(--color-primary);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
&:is(button):hover {
|
||||
background-color: color-mix(
|
||||
in srgb,
|
||||
var(--color-primary) 20%,
|
||||
transparent
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
&:is(button) {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 1px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,402 @@
|
||||
<script lang="ts">
|
||||
import { onMount, untrack } from "svelte";
|
||||
import { ripple } from "#lib/actions/ripple.js";
|
||||
import {
|
||||
listNotes,
|
||||
listNoteTags,
|
||||
type Note,
|
||||
type NoteTag,
|
||||
} from "#lib/api/notes.js";
|
||||
import NoteText from "#lib/components/annotations/NoteText.svelte";
|
||||
import Avatar from "#lib/components/ui/Avatar.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatListDate } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { replaceParam } from "#lib/params.js";
|
||||
import { NOTES_PARAM, notes } from "#lib/stores/notes.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { isMobile } from "#lib/viewport.js";
|
||||
import { goto } from "$app/navigation";
|
||||
|
||||
const PAGE = 50;
|
||||
|
||||
let items = $state<Note[]>([]);
|
||||
let tags = $state<NoteTag[]>([]);
|
||||
let loading = $state(true);
|
||||
let loadingMore = $state(false);
|
||||
let hasMore = $state(false);
|
||||
let failed = $state(false);
|
||||
let token = 0;
|
||||
|
||||
const chips = $derived.by(() => {
|
||||
const current = notes.tag;
|
||||
if (current === null || tags.some((item) => item.tag === current)) {
|
||||
return tags;
|
||||
}
|
||||
return [{ count: 0, tag: current }, ...tags];
|
||||
});
|
||||
|
||||
async function load(tag: string | null, offset = 0) {
|
||||
token += 1;
|
||||
const mine = token;
|
||||
if (offset === 0) {
|
||||
loading = true;
|
||||
} else {
|
||||
loadingMore = true;
|
||||
}
|
||||
try {
|
||||
const page = await listNotes(tag, offset, PAGE);
|
||||
if (mine !== token) {
|
||||
return;
|
||||
}
|
||||
items = offset === 0 ? page : [...items, ...page];
|
||||
hasMore = page.length === PAGE;
|
||||
failed = false;
|
||||
} catch {
|
||||
if (mine === token) {
|
||||
failed = true;
|
||||
}
|
||||
} finally {
|
||||
if (mine === token) {
|
||||
loading = false;
|
||||
loadingMore = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
const { tag } = notes;
|
||||
untrack(() => {
|
||||
replaceParam(NOTES_PARAM, tag ?? "");
|
||||
load(tag);
|
||||
});
|
||||
});
|
||||
|
||||
onMount(() => {
|
||||
listNoteTags()
|
||||
.then((result) => {
|
||||
tags = result;
|
||||
})
|
||||
.catch(() => undefined);
|
||||
return () => {
|
||||
notes.tag = null;
|
||||
replaceParam(NOTES_PARAM, null);
|
||||
};
|
||||
});
|
||||
|
||||
function pick(tag: string | null) {
|
||||
notes.tag = notes.tag === tag ? null : tag;
|
||||
}
|
||||
|
||||
function href(note: Note): string {
|
||||
return `/app/${note.chat_id}?message=${note.message_id}`;
|
||||
}
|
||||
|
||||
function open(event: MouseEvent, note: Note) {
|
||||
if (
|
||||
event.metaKey ||
|
||||
event.ctrlKey ||
|
||||
event.shiftKey ||
|
||||
event.button !== 0
|
||||
) {
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
ui.requestJump(note.chat_id, note.message_id);
|
||||
if (isMobile()) {
|
||||
ui.resetPanel();
|
||||
goto(href(note));
|
||||
return;
|
||||
}
|
||||
const tag = notes.tag === null ? "" : encodeURIComponent(notes.tag);
|
||||
goto(`${href(note)}&${NOTES_PARAM}=${tag}`);
|
||||
}
|
||||
|
||||
function chatTitle(note: Note): string {
|
||||
return note.chat_title ?? t("chat.fallbackTitle", { id: note.chat_id });
|
||||
}
|
||||
|
||||
function quote(note: Note): string {
|
||||
if (note.message_date === null) {
|
||||
return t("notes.messageGone");
|
||||
}
|
||||
return note.message_text ?? t("notes.mediaMessage");
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="notes">
|
||||
{#if chips.length > 0}
|
||||
<div class="chips">
|
||||
<button
|
||||
aria-pressed={notes.tag === null}
|
||||
class="chip"
|
||||
onclick={() => pick(null)}
|
||||
type="button"
|
||||
class:on={notes.tag === null}
|
||||
>
|
||||
{t("notes.all")}
|
||||
</button>
|
||||
{#each chips as item (item.tag)}
|
||||
<button
|
||||
aria-pressed={notes.tag === item.tag}
|
||||
class="chip"
|
||||
onclick={() => pick(item.tag)}
|
||||
type="button"
|
||||
class:on={notes.tag === item.tag}
|
||||
>
|
||||
#{item.tag}
|
||||
{#if item.count > 0}
|
||||
<span class="value">{item.count}</span>
|
||||
{/if}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if loading && items.length === 0}
|
||||
<div class="center"><Spinner /></div>
|
||||
{:else if failed && items.length === 0}
|
||||
<div class="state">
|
||||
<p>{t("notes.failed")}</p>
|
||||
<Button onclick={() => load(notes.tag)} variant="text">
|
||||
{t("notes.retry")}
|
||||
</Button>
|
||||
</div>
|
||||
{:else if items.length === 0}
|
||||
<EmptyState
|
||||
description={notes.tag === null ? t("notes.empty") : undefined}
|
||||
title={notes.tag === null
|
||||
? t("notes.emptyTitle")
|
||||
: t("notes.emptyTag", { tag: notes.tag })}
|
||||
/>
|
||||
{:else}
|
||||
<ul class="list">
|
||||
{#each items as note (note.id)}
|
||||
<li>
|
||||
<a
|
||||
class="row"
|
||||
href={href(note)}
|
||||
onclick={(event) => open(event, note)}
|
||||
use:ripple
|
||||
>
|
||||
<Avatar
|
||||
avatar={{
|
||||
id: note.chat_id,
|
||||
kind: note.chat_id > 0 ? "peer" : "chat",
|
||||
}}
|
||||
colorKey={note.chat_id}
|
||||
hasAvatar={note.chat_has_avatar}
|
||||
name={chatTitle(note)}
|
||||
size={2.75}
|
||||
/>
|
||||
<div class="body">
|
||||
<div class="top">
|
||||
<span class="title">{chatTitle(note)}</span>
|
||||
<span class="date">{formatListDate(note.created_at)}</span>
|
||||
</div>
|
||||
<div class="text">
|
||||
<NoteText interactive={false} text={note.text} />
|
||||
</div>
|
||||
<div class="quote" class:deleted={note.message_deleted}>
|
||||
{quote(note)}
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{#if hasMore}
|
||||
<div class="more">
|
||||
<Button
|
||||
loading={loadingMore}
|
||||
onclick={() => load(notes.tag, items.length)}
|
||||
variant="text"
|
||||
>
|
||||
{t("notes.more")}
|
||||
</Button>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.notes {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
.chips {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.375rem;
|
||||
|
||||
padding: 0.75rem 1rem;
|
||||
border-bottom: 1px solid var(--color-borders);
|
||||
}
|
||||
|
||||
.chip {
|
||||
cursor: pointer;
|
||||
|
||||
display: inline-flex;
|
||||
gap: 0.375rem;
|
||||
align-items: center;
|
||||
|
||||
height: 1.75rem;
|
||||
padding: 0 0.5625rem;
|
||||
border: 0;
|
||||
border-radius: 0.875rem;
|
||||
|
||||
font: inherit;
|
||||
font-size: 0.75rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
color: var(--color-text);
|
||||
|
||||
background-color: var(--color-chat-hover);
|
||||
|
||||
transition:
|
||||
background-color 0.15s ease-out,
|
||||
box-shadow 0.15s ease-out;
|
||||
|
||||
&.on {
|
||||
background-color: color-mix(
|
||||
in srgb,
|
||||
var(--color-primary) 12%,
|
||||
transparent
|
||||
);
|
||||
box-shadow: inset 0 0 0 1px var(--color-primary);
|
||||
}
|
||||
|
||||
@media (pointer: coarse) {
|
||||
height: 2.25rem;
|
||||
padding: 0 0.75rem;
|
||||
border-radius: 1.125rem;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 1px;
|
||||
}
|
||||
}
|
||||
|
||||
.value {
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.list {
|
||||
margin: 0;
|
||||
padding: 0.5rem;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.row {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
|
||||
display: flex;
|
||||
gap: 0.75rem;
|
||||
align-items: flex-start;
|
||||
|
||||
padding: 0.5rem 0.625rem;
|
||||
border-radius: 0.625rem;
|
||||
|
||||
color: var(--color-text);
|
||||
text-decoration: none;
|
||||
|
||||
transition: background-color 0.15s ease;
|
||||
|
||||
--ripple-color: var(--color-interactive-element-hover);
|
||||
|
||||
@media (hover: hover) {
|
||||
&:hover {
|
||||
background-color: var(--color-chat-hover);
|
||||
}
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
.body {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.top {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: baseline;
|
||||
}
|
||||
|
||||
.title {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
|
||||
font-size: 0.9375rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.date {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.text {
|
||||
margin-top: 0.125rem;
|
||||
font-size: 0.9375rem;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.quote {
|
||||
overflow: hidden;
|
||||
|
||||
margin-top: 0.375rem;
|
||||
padding-inline-start: 0.5rem;
|
||||
border-inline-start: 2px solid var(--color-primary);
|
||||
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text-secondary);
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
&.deleted {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
}
|
||||
|
||||
.center {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 2rem 0;
|
||||
}
|
||||
|
||||
.state {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
align-items: center;
|
||||
|
||||
padding: 2rem 1rem;
|
||||
|
||||
color: var(--color-text-secondary);
|
||||
text-align: center;
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.more {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0 0.5rem 1rem;
|
||||
}
|
||||
</style>
|
||||
@@ -8,6 +8,8 @@
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
@@ -17,14 +19,19 @@
|
||||
let token = $state("");
|
||||
let adding = $state(false);
|
||||
|
||||
const statusLabels: Record<string, string> = {
|
||||
error: "ошибка",
|
||||
ok: "слушает",
|
||||
pending: "подключается",
|
||||
removed: "отключён",
|
||||
unauthorized: "токен отклонён",
|
||||
const STATUS_KEYS: Record<string, MessageKey> = {
|
||||
error: "bots.status.error",
|
||||
ok: "bots.status.ok",
|
||||
pending: "bots.status.pending",
|
||||
removed: "bots.status.removed",
|
||||
unauthorized: "bots.status.unauthorized",
|
||||
};
|
||||
|
||||
function statusLabel(status: string): string {
|
||||
const key = STATUS_KEYS[status];
|
||||
return key ? t(key) : status;
|
||||
}
|
||||
|
||||
async function load() {
|
||||
loading = true;
|
||||
try {
|
||||
@@ -49,7 +56,7 @@
|
||||
await load();
|
||||
await accounts.load();
|
||||
} catch {
|
||||
toasts.error("Не похоже на токен бота");
|
||||
toasts.error(t("bots.badToken"));
|
||||
} finally {
|
||||
adding = false;
|
||||
}
|
||||
@@ -81,7 +88,7 @@
|
||||
{#if loading}
|
||||
<Spinner />
|
||||
{:else if bots.length === 0}
|
||||
<p class="empty">Ботов пока нет.</p>
|
||||
<p class="empty">{t("bots.empty")}</p>
|
||||
{:else}
|
||||
<ul class="bots">
|
||||
{#each bots as bot (bot.bot_id)}
|
||||
@@ -94,9 +101,9 @@
|
||||
>
|
||||
<span class="name">{botName(bot)}</span>
|
||||
<span class="meta">
|
||||
{statusLabels[bot.status] ?? bot.status}
|
||||
{statusLabel(bot.status)}
|
||||
{#if bot.account_id !== null}
|
||||
· аккаунт {bot.account_id}
|
||||
· {t("bots.account", { id: bot.account_id })}
|
||||
{/if}
|
||||
</span>
|
||||
{#if bot.status_detail}
|
||||
@@ -105,7 +112,7 @@
|
||||
</button>
|
||||
{#if bot.enabled}
|
||||
<Button
|
||||
aria-label="Отключить"
|
||||
aria-label={t("bots.disconnect")}
|
||||
onclick={() => remove(bot)}
|
||||
round
|
||||
smaller
|
||||
@@ -121,25 +128,14 @@
|
||||
|
||||
<div class="add">
|
||||
<label class="field">
|
||||
<span>Токен бота от @BotFather</span>
|
||||
<span>{t("bots.token")}</span>
|
||||
<input placeholder="123456:AA…" type="password" bind:value={token}>
|
||||
</label>
|
||||
<Button fluid loading={adding} onclick={add}>Добавить</Button>
|
||||
<Button fluid loading={adding} onclick={add}>{t("bots.add")}</Button>
|
||||
</div>
|
||||
|
||||
<p class="note">
|
||||
Бот входит по MTProto отдельной авторизацией — это не отнимает getUpdates у
|
||||
того, кто держит того же бота через Bot API, и не требует вебхука. Дальше он
|
||||
становится обычным аккаунтом архива: чаты, сообщения, медиа и участники
|
||||
групп видны там же, где переписка остальных аккаунтов.
|
||||
</p>
|
||||
<p class="note">
|
||||
Прошлое подтягивается из очереди недоставленных апдейтов, которую Telegram
|
||||
держит для бота; история диалогов боту запрещена, глубже этой очереди
|
||||
заглянуть нельзя. В личке бот видит каждого, кто ему написал; в группах всё
|
||||
— только при выключенном privacy mode. Отключение убирает токен и сессию,
|
||||
архив остаётся.
|
||||
</p>
|
||||
<p class="note">{t("bots.login")}</p>
|
||||
<p class="note">{t("bots.history")}</p>
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
|
||||
@@ -13,8 +13,9 @@
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatBytes } from "#lib/format/media.js";
|
||||
import { plural } from "#lib/format/shares.js";
|
||||
import { filesLabel } from "#lib/format/storage.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
|
||||
interface Props {
|
||||
label?: string;
|
||||
@@ -28,12 +29,12 @@
|
||||
let confirming = $state(false);
|
||||
let moving = $state(false);
|
||||
let moved = $state<TrashOutcome | null>(null);
|
||||
let problem = $state<string | null>(null);
|
||||
let problem = $state<MessageKey | null>(null);
|
||||
|
||||
function where(scope: StorageScope): string {
|
||||
return "folderId" in target
|
||||
? `в ${scope.chats} ${plural(scope.chats, "чате", "чатах", "чатах")} папки`
|
||||
: "в этом чате";
|
||||
? t("storage.inFolder", { count: scope.chats })
|
||||
: t("storage.inChat");
|
||||
}
|
||||
|
||||
async function load() {
|
||||
@@ -56,7 +57,7 @@
|
||||
await load();
|
||||
onchange?.();
|
||||
} catch {
|
||||
problem = "Не удалось переместить файлы в корзину";
|
||||
problem = "storage.scope.trashFailed";
|
||||
} finally {
|
||||
moving = false;
|
||||
}
|
||||
@@ -74,7 +75,7 @@
|
||||
await load();
|
||||
onchange?.();
|
||||
} catch {
|
||||
problem = "Не удалось вернуть файлы";
|
||||
problem = "storage.restoreFailed";
|
||||
} finally {
|
||||
moving = false;
|
||||
}
|
||||
@@ -90,15 +91,15 @@
|
||||
{#if moved && moved.files > 0}
|
||||
<div class="files">
|
||||
<div class="text">
|
||||
<span>{filesLabel(moved.files)} в корзине</span>
|
||||
<small>{formatBytes(moved.bytes)} освободится через 7 дней</small>
|
||||
<span>{t("storage.inTrash", { files: filesLabel(moved.files) })}</span>
|
||||
<small>{t("storage.freed", { size: formatBytes(moved.bytes) })}</small>
|
||||
{#if problem}
|
||||
<small class="failed">{problem}</small>
|
||||
<small class="failed">{t(problem)}</small>
|
||||
{/if}
|
||||
</div>
|
||||
<Button disabled={moving} onclick={undo} smaller variant="text">
|
||||
<Icon name="undo" size="1.25rem" />
|
||||
<span>Вернуть</span>
|
||||
<span>{t("storage.restore")}</span>
|
||||
</Button>
|
||||
</div>
|
||||
{:else if files && files.files > 0}
|
||||
@@ -106,22 +107,19 @@
|
||||
{#if confirming}
|
||||
<div class="text">
|
||||
<span>
|
||||
{filesLabel(files.files)}, {formatBytes(files.bytes)},
|
||||
{plural(
|
||||
files.files,
|
||||
"уйдёт в корзину и перестанет скачиваться сам",
|
||||
"уйдут в корзину и перестанут скачиваться сами",
|
||||
"уйдут в корзину и перестанут скачиваться сами"
|
||||
)}.
|
||||
{t("storage.scope.confirm", {
|
||||
count: files.files,
|
||||
files: filesLabel(files.files),
|
||||
size: formatBytes(files.bytes),
|
||||
})}
|
||||
</span>
|
||||
{#if files.gone > 0}
|
||||
<small class="warn">
|
||||
{files.gone}
|
||||
из них потом не скачать заново
|
||||
{t("storage.scope.gone", { count: files.gone })}
|
||||
</small>
|
||||
{/if}
|
||||
{#if problem}
|
||||
<small class="failed">{problem}</small>
|
||||
<small class="failed">{t(problem)}</small>
|
||||
{/if}
|
||||
<div class="actions">
|
||||
<Button
|
||||
@@ -131,7 +129,7 @@
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
Отмена
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
<Button
|
||||
disabled={moving}
|
||||
@@ -141,7 +139,7 @@
|
||||
smaller
|
||||
>
|
||||
<Icon name="delete" size="1.25rem" />
|
||||
<span>В корзину</span>
|
||||
<span>{t("storage.toTrash")}</span>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -156,18 +154,18 @@
|
||||
</small>
|
||||
{/if}
|
||||
{:else}
|
||||
<span>{formatBytes(files.bytes)} уже скачано</span>
|
||||
<span>
|
||||
{t("storage.scope.downloaded", { size: formatBytes(files.bytes) })}
|
||||
</span>
|
||||
<small>{filesLabel(files.files)} {where(files)}</small>
|
||||
{/if}
|
||||
{#if files.kept > 0}
|
||||
<small>
|
||||
Ещё {filesLabel(files.kept)} есть и в других чатах,
|
||||
{plural(
|
||||
files.kept,
|
||||
"он останется",
|
||||
"они останутся",
|
||||
"они останутся"
|
||||
)}
|
||||
{t("storage.scope.kept", {
|
||||
count: files.kept,
|
||||
files: filesLabel(files.kept),
|
||||
n: files.kept.toLocaleString(locale.tag),
|
||||
})}
|
||||
</small>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -180,7 +178,7 @@
|
||||
variant="gray"
|
||||
>
|
||||
<Icon name="delete" size="1.25rem" />
|
||||
<span>В корзину</span>
|
||||
<span>{t("storage.toTrash")}</span>
|
||||
</Button>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -189,10 +187,10 @@
|
||||
<div class="text">
|
||||
<span>{label}</span>
|
||||
<small>
|
||||
{filesLabel(files.kept)}
|
||||
есть и в других чатах, убрать
|
||||
{plural(files.kept, "его", "их", "их")}
|
||||
можно из списка ниже
|
||||
{t("storage.scope.keptOnly", {
|
||||
count: files.kept,
|
||||
files: filesLabel(files.kept),
|
||||
})}
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import Avatar from "#lib/components/ui/Avatar.svelte";
|
||||
import ContextMenu from "#lib/components/ui/ContextMenu.svelte";
|
||||
import { formatBytes } from "#lib/format/media.js";
|
||||
import { filesLabel, GROUP_LABELS } from "#lib/format/storage.js";
|
||||
import { filesLabel, groupLabel } from "#lib/format/storage.js";
|
||||
|
||||
interface Props {
|
||||
chat: StorageChat;
|
||||
@@ -24,7 +24,7 @@
|
||||
const parts = $derived(chat.groups.filter((item) => item.bytes > 0));
|
||||
const makeup = $derived(
|
||||
parts
|
||||
.map((item) => `${GROUP_LABELS[item.group]}: ${formatBytes(item.bytes)}`)
|
||||
.map((item) => `${groupLabel(item.group)}: ${formatBytes(item.bytes)}`)
|
||||
.join(", ")
|
||||
);
|
||||
</script>
|
||||
|
||||
@@ -31,9 +31,11 @@
|
||||
import { formatBytes } from "#lib/format/media.js";
|
||||
import {
|
||||
filesLabel,
|
||||
GROUP_LABELS,
|
||||
groupLabel,
|
||||
messagesLabel,
|
||||
} from "#lib/format/storage.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
import {
|
||||
@@ -53,9 +55,9 @@
|
||||
const PAGE = 30;
|
||||
const UNDO_MS = 12_000;
|
||||
const UNDO_GUARD_MS = 600;
|
||||
const LISTINGS: { label: string; value: StorageListing }[] = [
|
||||
{ label: "Файлы", value: "files" },
|
||||
{ label: "Чаты", value: "chats" },
|
||||
const LISTINGS: { label: MessageKey; value: StorageListing }[] = [
|
||||
{ label: "storage.listing.files", value: "files" },
|
||||
{ label: "storage.listing.chats", value: "chats" },
|
||||
];
|
||||
|
||||
let summary = $state<StorageSummary | null>(null);
|
||||
@@ -70,7 +72,7 @@
|
||||
let undo = $state<{ files: StorageFile[]; outcome: TrashOutcome } | null>(
|
||||
null
|
||||
);
|
||||
let problem = $state<string | null>(null);
|
||||
let problem = $state<MessageKey | null>(null);
|
||||
let viewerOpen = $state(false);
|
||||
let viewerIndex = $state(0);
|
||||
const selected = new SvelteSet<number>();
|
||||
@@ -89,12 +91,11 @@
|
||||
const heaviestChat = $derived(heavyChats[0]?.bytes ?? 0);
|
||||
const emptiness = $derived.by(() => {
|
||||
if (group !== null) {
|
||||
return "В этой группе нет файлов.";
|
||||
return t("storage.empty.group");
|
||||
}
|
||||
return chatId === null
|
||||
? "На диске нет скачанных файлов."
|
||||
: "В этом чате нет скачанных файлов.";
|
||||
return chatId === null ? t("storage.empty.all") : t("storage.empty.chat");
|
||||
});
|
||||
const failure = $derived(problem && t(problem));
|
||||
const chosen = $derived(files.filter((file) => selected.has(file.media_id)));
|
||||
const chosenBytes = $derived(
|
||||
chosen.reduce((sum, file) => sum + file.file_size, 0)
|
||||
@@ -120,7 +121,7 @@
|
||||
);
|
||||
|
||||
function chatTitle(id: number): string {
|
||||
return chats.byId(id)?.title ?? `Чат ${id}`;
|
||||
return chats.byId(id)?.title ?? t("ui.chat", { id });
|
||||
}
|
||||
|
||||
async function loadSummary() {
|
||||
@@ -249,11 +250,11 @@
|
||||
scope?.refresh();
|
||||
showUndo(outcome, trashed);
|
||||
if (outcome.blocked.length > 0) {
|
||||
problem = "Файл занят в сторис или аватаре и остался на диске";
|
||||
problem = "storage.blocked";
|
||||
}
|
||||
await loadSummary();
|
||||
} catch {
|
||||
problem = "Не удалось переместить в корзину";
|
||||
problem = "storage.trashFailed";
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -273,7 +274,7 @@
|
||||
scope?.refresh();
|
||||
await loadSummary();
|
||||
} catch {
|
||||
problem = "Не удалось вернуть файлы";
|
||||
problem = "storage.restoreFailed";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -281,7 +282,7 @@
|
||||
try {
|
||||
await downloadMedia(file.media_id);
|
||||
} catch {
|
||||
problem = "Не удалось скачать файл";
|
||||
problem = "ui.downloadFailed";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -330,22 +331,26 @@
|
||||
{#if summary.files > 0 || chatId !== null}
|
||||
<section class="summary">
|
||||
<div class="hero">
|
||||
<span class="total">{formatBytes(summary.bytes) || "0 B"}</span>
|
||||
<span class="total">
|
||||
{formatBytes(summary.bytes) || t("storage.zero")}
|
||||
</span>
|
||||
<span class="count">
|
||||
{filesLabel(summary.files)}
|
||||
{#if chatId !== null}
|
||||
в этом чате
|
||||
{t("storage.hero.chat", { files: filesLabel(summary.files) })}
|
||||
{:else if summary.trash_bytes > 0}
|
||||
· ещё {formatBytes(summary.trash_bytes)} в корзине
|
||||
{t("storage.hero.trash", {
|
||||
files: filesLabel(summary.files),
|
||||
size: formatBytes(summary.trash_bytes),
|
||||
})}
|
||||
{:else}
|
||||
на диске
|
||||
{t("storage.hero.disk", { files: filesLabel(summary.files) })}
|
||||
{/if}
|
||||
</span>
|
||||
</div>
|
||||
<div class="stack" class:bare={groups.length === 0}>
|
||||
{#each groups as item (item.group)}
|
||||
<span
|
||||
title="{GROUP_LABELS[item.group]}: {formatBytes(item.bytes)}"
|
||||
title="{groupLabel(item.group)}: {formatBytes(item.bytes)}"
|
||||
style:background-color="var(--color-storage-{item.group})"
|
||||
style:flex-grow={item.bytes}
|
||||
></span>
|
||||
@@ -353,7 +358,9 @@
|
||||
{#if chatId === null && summary.trash_bytes > 0}
|
||||
<span
|
||||
class="trashed"
|
||||
title="Корзина: {formatBytes(summary.trash_bytes)}"
|
||||
title={t("storage.trash.title", {
|
||||
size: formatBytes(summary.trash_bytes),
|
||||
})}
|
||||
style:flex-grow={summary.trash_bytes}
|
||||
></span>
|
||||
{/if}
|
||||
@@ -371,7 +378,7 @@
|
||||
class="dot"
|
||||
style:background-color="var(--color-storage-{item.group})"
|
||||
></span>
|
||||
{GROUP_LABELS[item.group]}
|
||||
{groupLabel(item.group)}
|
||||
<span class="value">{formatBytes(item.bytes)}</span>
|
||||
</button>
|
||||
{/each}
|
||||
@@ -386,14 +393,14 @@
|
||||
type="button"
|
||||
>
|
||||
<Icon name="delete" size="1.375rem" />
|
||||
<span class="label">Корзина</span>
|
||||
<span class="label">{t("storage.trash")}</span>
|
||||
<span class="value">
|
||||
{#if summary.trash_files > 0}
|
||||
<span class="swatch"></span>
|
||||
{filesLabel(summary.trash_files)}
|
||||
· {formatBytes(summary.trash_bytes)}
|
||||
{:else}
|
||||
пусто
|
||||
{t("storage.trash.nothing")}
|
||||
{/if}
|
||||
</span>
|
||||
<Icon name="next" size="1.125rem" />
|
||||
@@ -407,13 +414,13 @@
|
||||
type="button"
|
||||
class:on={listing === item.value}
|
||||
>
|
||||
{item.label}
|
||||
{t(item.label)}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
<ScopeFiles
|
||||
label="Все файлы чата"
|
||||
label={t("storage.chatFiles")}
|
||||
onchange={() => {
|
||||
hideUndo();
|
||||
reload();
|
||||
@@ -426,12 +433,14 @@
|
||||
|
||||
{#if listing === "files" && files.length > 0}
|
||||
<div class="section-title">
|
||||
<h3>Самые тяжёлые</h3>
|
||||
<h3>{t("storage.heaviest")}</h3>
|
||||
{#if summary && group === null && summary.heavy_files > 0}
|
||||
<span>
|
||||
{filesLabel(summary.heavy_files)}
|
||||
крупнее {formatBytes(summary.heavy_threshold)}
|
||||
= {formatBytes(summary.heavy_bytes)}
|
||||
{t("storage.heavy", {
|
||||
files: filesLabel(summary.heavy_files),
|
||||
size: formatBytes(summary.heavy_bytes),
|
||||
threshold: formatBytes(summary.heavy_threshold),
|
||||
})}
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -448,17 +457,17 @@
|
||||
>
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="data" onselect={() => openChat(chat.chat_id)}>
|
||||
Файлы чата
|
||||
{t("storage.menu.chatFiles")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="reply" onselect={() => visit(chat)}>
|
||||
Перейти в чат
|
||||
{t("storage.menu.openChat")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem
|
||||
icon="settings"
|
||||
onselect={() =>
|
||||
policyUi.edit({ chatId: chat.chat_id }, chatTitle(chat.chat_id))}
|
||||
>
|
||||
Политика захвата
|
||||
{t("storage.menu.policy")}
|
||||
</ContextMenuItem>
|
||||
{/snippet}
|
||||
</StorageChatRow>
|
||||
@@ -484,19 +493,19 @@
|
||||
>
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="open-in-new-tab" onselect={() => open(index)}>
|
||||
Открыть
|
||||
{t("ui.open")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="reply" onselect={() => jump(file)}>
|
||||
Перейти к сообщению
|
||||
{t("ui.jumpToMessage")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="download" onselect={() => save(file)}>
|
||||
Скачать файл
|
||||
{t("ui.downloadFile")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem
|
||||
icon="delete"
|
||||
onselect={() => trash([file.media_id])}
|
||||
>
|
||||
В корзину
|
||||
{t("storage.toTrash")}
|
||||
</ContextMenuItem>
|
||||
{/snippet}
|
||||
</StorageRow>
|
||||
@@ -506,29 +515,31 @@
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if failed}
|
||||
<div class="state">
|
||||
<p>Не удалось загрузить хранилище.</p>
|
||||
<p>{t("storage.loadFailed")}</p>
|
||||
<Button onclick={() => reload()} smaller variant="text">
|
||||
Повторить
|
||||
{t("ui.retry")}
|
||||
</Button>
|
||||
</div>
|
||||
{:else if shown === 0}
|
||||
<div class="state"><p>{emptiness}</p></div>
|
||||
{:else if !done}
|
||||
<button class="more" onclick={() => loadMore()} type="button">
|
||||
Показать ещё
|
||||
{t("ui.showMore")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if chosen.length > 0}
|
||||
<SelectionBar
|
||||
failure={problem}
|
||||
note={chosenGone > 0 ? `${chosenGone} не скачать заново` : undefined}
|
||||
{failure}
|
||||
note={chosenGone > 0
|
||||
? t("storage.cantRefetch", { count: chosenGone })
|
||||
: undefined}
|
||||
title="{filesLabel(chosen.length)} · {formatBytes(chosenBytes)}"
|
||||
warn
|
||||
>
|
||||
<Button onclick={() => selected.clear()} smaller variant="text">
|
||||
Снять
|
||||
{t("storage.deselect")}
|
||||
</Button>
|
||||
<Button
|
||||
disabled={busy}
|
||||
@@ -538,22 +549,22 @@
|
||||
smaller
|
||||
>
|
||||
<Icon name="delete" size="1.25rem" />
|
||||
<span>В корзину</span>
|
||||
<span>{t("storage.toTrash")}</span>
|
||||
</Button>
|
||||
</SelectionBar>
|
||||
{:else if undo}
|
||||
<SelectionBar
|
||||
failure={problem}
|
||||
note="{formatBytes(undo.outcome.bytes)} освободится через 7 дней"
|
||||
title="{filesLabel(undo.outcome.files)} в корзине"
|
||||
{failure}
|
||||
note={t("storage.freed", { size: formatBytes(undo.outcome.bytes) })}
|
||||
title={t("storage.inTrash", { files: filesLabel(undo.outcome.files) })}
|
||||
>
|
||||
<Button onclick={restoreLast} smaller variant="text">
|
||||
<Icon name="undo" size="1.25rem" />
|
||||
<span>Вернуть</span>
|
||||
<span>{t("storage.restore")}</span>
|
||||
</Button>
|
||||
</SelectionBar>
|
||||
{:else if problem}
|
||||
<SelectionBar failure={problem} title="Не получилось">
|
||||
{:else if failure}
|
||||
<SelectionBar {failure} title={t("storage.failed")}>
|
||||
<Button
|
||||
onclick={() => {
|
||||
problem = null;
|
||||
@@ -561,7 +572,7 @@
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
Понятно
|
||||
{t("ui.gotIt")}
|
||||
</Button>
|
||||
</SelectionBar>
|
||||
{/if}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatBytes } from "#lib/format/media.js";
|
||||
import { groupOf } from "#lib/format/storage.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
fileName: string;
|
||||
@@ -54,7 +55,7 @@
|
||||
>
|
||||
<span class="check">
|
||||
<input
|
||||
aria-label="Выбрать {fileName}"
|
||||
aria-label={t("storage.select", { name: fileName })}
|
||||
checked={selected}
|
||||
onchange={ontoggle}
|
||||
type="checkbox"
|
||||
@@ -82,7 +83,7 @@
|
||||
<span class="note">{note}</span>
|
||||
{/if}
|
||||
{#if !refetchable}
|
||||
<span class="gone">Не скачать заново</span>
|
||||
<span class="gone">{t("storage.gone")}</span>
|
||||
{/if}
|
||||
</span>
|
||||
<span class="size">{formatBytes(size)}</span>
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatBytes } from "#lib/format/media.js";
|
||||
import { plural } from "#lib/format/shares.js";
|
||||
import {
|
||||
filesLabel,
|
||||
messagesLabel,
|
||||
purgeLabel,
|
||||
} from "#lib/format/storage.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { isMobile } from "#lib/viewport.js";
|
||||
@@ -40,7 +41,7 @@
|
||||
let failed = $state(false);
|
||||
let busy = $state(false);
|
||||
let doomed = $state<TrashItem[] | null>(null);
|
||||
let problem = $state<string | null>(null);
|
||||
let problem = $state<MessageKey | null>(null);
|
||||
let viewerOpen = $state(false);
|
||||
let viewerIndex = $state(0);
|
||||
const selected = new SvelteSet<string>();
|
||||
@@ -58,6 +59,7 @@
|
||||
const doomedGone = $derived(
|
||||
doomed?.filter((item) => !item.refetchable).length ?? 0
|
||||
);
|
||||
const failure = $derived(problem && t(problem));
|
||||
const viewerItems = $derived<ViewerItem[]>(
|
||||
items.map((item) => ({
|
||||
caption: `${formatBytes(item.file_size)} · ${chatTitle(item.chat_id)}`,
|
||||
@@ -77,7 +79,7 @@
|
||||
}
|
||||
|
||||
function chatTitle(chatId: number): string {
|
||||
return chats.byId(chatId)?.title ?? `Чат ${chatId}`;
|
||||
return chats.byId(chatId)?.title ?? t("ui.chat", { id: chatId });
|
||||
}
|
||||
|
||||
async function loadTotal() {
|
||||
@@ -132,7 +134,7 @@
|
||||
await restoreFromTrash(keys);
|
||||
drop(keys);
|
||||
} catch {
|
||||
problem = "Не удалось вернуть файлы";
|
||||
problem = "storage.restoreFailed";
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -148,7 +150,7 @@
|
||||
await restoreFromTrash(null);
|
||||
await load();
|
||||
} catch {
|
||||
problem = "Не удалось вернуть файлы";
|
||||
problem = "storage.restoreFailed";
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -167,7 +169,7 @@
|
||||
everything = false;
|
||||
await load();
|
||||
} catch {
|
||||
problem = "Не удалось удалить файлы";
|
||||
problem = "storage.trash.deleteFailed";
|
||||
} finally {
|
||||
busy = false;
|
||||
}
|
||||
@@ -190,15 +192,12 @@
|
||||
</script>
|
||||
|
||||
<div class="trash">
|
||||
<p class="note">
|
||||
Файлы лежат здесь 7 дней, потом удаляются с диска. До этого их можно
|
||||
вернуть.
|
||||
</p>
|
||||
<p class="note">{t("storage.trash.note")}</p>
|
||||
|
||||
{#if total.files > 0}
|
||||
<button class="act" disabled={busy} onclick={restoreAll} type="button">
|
||||
<Icon name="undo" size="1.375rem" />
|
||||
<span class="label">Вернуть всё</span>
|
||||
<span class="label">{t("storage.trash.restoreAll")}</span>
|
||||
<span class="value">{filesLabel(total.files)}</span>
|
||||
</button>
|
||||
<button
|
||||
@@ -209,7 +208,7 @@
|
||||
type="button"
|
||||
>
|
||||
<Icon name="delete" size="1.375rem" />
|
||||
<span class="label">Очистить корзину</span>
|
||||
<span class="label">{t("storage.trash.clear")}</span>
|
||||
<span class="value">{formatBytes(total.bytes)}</span>
|
||||
</button>
|
||||
{/if}
|
||||
@@ -233,13 +232,13 @@
|
||||
>
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="open-in-new-tab" onselect={() => open(index)}>
|
||||
Открыть
|
||||
{t("ui.open")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="undo" onselect={() => restore([item])}>
|
||||
Вернуть
|
||||
{t("storage.restore")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem icon="reply" onselect={() => jump(item)}>
|
||||
Перейти к сообщению
|
||||
{t("ui.jumpToMessage")}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuItem
|
||||
icon="delete"
|
||||
@@ -247,7 +246,7 @@
|
||||
doomed = [item];
|
||||
}}
|
||||
>
|
||||
Удалить насовсем
|
||||
{t("storage.trash.deleteForever")}
|
||||
</ContextMenuItem>
|
||||
{/snippet}
|
||||
</StorageRow>
|
||||
@@ -257,22 +256,24 @@
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if failed}
|
||||
<div class="state">
|
||||
<p>Не удалось загрузить корзину.</p>
|
||||
<Button onclick={load} smaller variant="text">Повторить</Button>
|
||||
<p>{t("storage.trash.loadFailed")}</p>
|
||||
<Button onclick={load} smaller variant="text">{t("ui.retry")}</Button>
|
||||
</div>
|
||||
{:else if items.length === 0}
|
||||
<div class="state"><p>Корзина пуста.</p></div>
|
||||
<div class="state"><p>{t("storage.trash.empty")}</p></div>
|
||||
{:else if !done}
|
||||
<button class="more" onclick={loadMore} type="button">
|
||||
Показать ещё
|
||||
{t("ui.showMore")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if chosen.length > 0}
|
||||
<SelectionBar
|
||||
failure={dialogOpen ? null : problem}
|
||||
note={chosenGone > 0 ? `${chosenGone} не скачать заново` : undefined}
|
||||
failure={dialogOpen ? null : failure}
|
||||
note={chosenGone > 0
|
||||
? t("storage.cantRefetch", { count: chosenGone })
|
||||
: undefined}
|
||||
title="{filesLabel(chosen.length)} · {formatBytes(bytesOf(chosen))}"
|
||||
warn
|
||||
>
|
||||
@@ -284,7 +285,7 @@
|
||||
smaller
|
||||
variant="danger"
|
||||
>
|
||||
Удалить
|
||||
{t("common.delete")}
|
||||
</Button>
|
||||
<Button
|
||||
disabled={busy}
|
||||
@@ -294,11 +295,11 @@
|
||||
smaller
|
||||
>
|
||||
<Icon name="undo" size="1.25rem" />
|
||||
<span>Вернуть</span>
|
||||
<span>{t("storage.restore")}</span>
|
||||
</Button>
|
||||
</SelectionBar>
|
||||
{:else if problem && !dialogOpen}
|
||||
<SelectionBar failure={problem} title="Не получилось">
|
||||
{:else if failure && !dialogOpen}
|
||||
<SelectionBar {failure} title={t("storage.failed")}>
|
||||
<Button
|
||||
onclick={() => {
|
||||
problem = null;
|
||||
@@ -306,7 +307,7 @@
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
Понятно
|
||||
{t("ui.gotIt")}
|
||||
</Button>
|
||||
</SelectionBar>
|
||||
{/if}
|
||||
@@ -327,59 +328,53 @@
|
||||
<Dialog.Content class="dialog-content">
|
||||
<header class="dialog-head">
|
||||
<Dialog.Title class="dialog-title">
|
||||
{everything ? "Очистить корзину?" : "Удалить насовсем?"}
|
||||
{everything
|
||||
? t("storage.trash.clearTitle")
|
||||
: t("storage.trash.deleteTitle")}
|
||||
</Dialog.Title>
|
||||
<Dialog.Close aria-label="Закрыть" class="dialog-close">
|
||||
<Dialog.Close aria-label={t("common.close")} class="dialog-close">
|
||||
<Icon name="close" size="1.25rem" />
|
||||
</Dialog.Close>
|
||||
</header>
|
||||
<div class="dialog-body">
|
||||
{#if everything}
|
||||
<p class="confirm">
|
||||
{filesLabel(total.files)}, {formatBytes(total.bytes)},
|
||||
{plural(
|
||||
total.files,
|
||||
"будет удалён",
|
||||
"будут удалены",
|
||||
"будут удалены"
|
||||
)}
|
||||
с диска.
|
||||
</p>
|
||||
<p class="confirm rest">
|
||||
То, что ещё есть в Telegram, потом можно скачать заново. Файлы из
|
||||
удалённых там сообщений пропадут насовсем.
|
||||
{t("storage.trash.willDelete", {
|
||||
count: total.files,
|
||||
files: filesLabel(total.files),
|
||||
size: formatBytes(total.bytes),
|
||||
})}
|
||||
</p>
|
||||
<p class="confirm rest">{t("storage.trash.clearRest")}</p>
|
||||
{:else if doomed}
|
||||
<p class="confirm">
|
||||
{filesLabel(doomed.length)}, {formatBytes(bytesOf(doomed))},
|
||||
{plural(
|
||||
doomed.length,
|
||||
"будет удалён",
|
||||
"будут удалены",
|
||||
"будут удалены"
|
||||
)}
|
||||
с диска.
|
||||
{t("storage.trash.willDelete", {
|
||||
count: doomed.length,
|
||||
files: filesLabel(doomed.length),
|
||||
size: formatBytes(bytesOf(doomed)),
|
||||
})}
|
||||
</p>
|
||||
{#if doomedGone > 0}
|
||||
<p class="confirm warn">
|
||||
<Icon name="warning" size="1.25rem" />
|
||||
<span>
|
||||
{filesLabel(doomedGone)}
|
||||
скачать заново нельзя: в Telegram
|
||||
{doomedGone === 1 ? "его" : "их"}
|
||||
уже нет.
|
||||
{t("storage.trash.goneWarn", {
|
||||
count: doomedGone,
|
||||
files: filesLabel(doomedGone),
|
||||
})}
|
||||
</span>
|
||||
</p>
|
||||
{/if}
|
||||
{#if doomedGone < doomed.length}
|
||||
<p class="confirm rest">
|
||||
{doomedGone === 0 ? "Потом их" : "Остальные"}
|
||||
можно скачать из Telegram заново.
|
||||
{doomedGone === 0
|
||||
? t("storage.trash.laterAll", { count: doomed.length })
|
||||
: t("storage.trash.laterRest")}
|
||||
</p>
|
||||
{/if}
|
||||
{/if}
|
||||
{#if problem}
|
||||
<p class="confirm failed">{problem}.</p>
|
||||
{#if failure}
|
||||
<p class="confirm failed">{failure}.</p>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="dialog-actions">
|
||||
@@ -387,7 +382,9 @@
|
||||
{#snippet child({
|
||||
props,
|
||||
})}
|
||||
<Button {...props} pill variant="text">Отмена</Button>
|
||||
<Button {...props} pill variant="text">
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
{/snippet}
|
||||
</Dialog.Close>
|
||||
<Button
|
||||
@@ -397,7 +394,7 @@
|
||||
pill
|
||||
variant="danger"
|
||||
>
|
||||
Удалить
|
||||
{t("common.delete")}
|
||||
</Button>
|
||||
</div>
|
||||
</Dialog.Content>
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
<script lang="ts">
|
||||
import type { FeedItem, FeedKind } from "#lib/api/types.js";
|
||||
import FeedFilters from "#lib/components/feed/FeedFilters.svelte";
|
||||
import FeedList from "#lib/components/feed/FeedList.svelte";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { isMobile } from "#lib/viewport.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const chatId = $derived(
|
||||
page.params.chatId ? Number(page.params.chatId) : null
|
||||
);
|
||||
|
||||
let kind = $state<FeedKind>("all");
|
||||
|
||||
function pick(next: FeedKind) {
|
||||
kind = next;
|
||||
}
|
||||
|
||||
function open(item: FeedItem, messageId: number) {
|
||||
if (chatId === null) {
|
||||
return;
|
||||
}
|
||||
if (item.kind === "profile" && !messageId) {
|
||||
ui.openPanel("profile");
|
||||
return;
|
||||
}
|
||||
ui.requestJump(chatId, messageId);
|
||||
if (isMobile()) {
|
||||
ui.closePanel();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if chatId !== null}
|
||||
<div class="filters">
|
||||
<FeedFilters {kind} onkind={pick} />
|
||||
</div>
|
||||
{#key chatId}
|
||||
<FeedList {chatId} {kind} onopen={open} />
|
||||
{/key}
|
||||
{/if}
|
||||
|
||||
<style lang="scss">
|
||||
.filters {
|
||||
position: sticky;
|
||||
z-index: 1;
|
||||
top: 0;
|
||||
background-color: var(--color-background);
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,151 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from "svelte";
|
||||
import { ripple } from "#lib/actions/ripple.js";
|
||||
import { listFeedMessages } from "#lib/api/endpoints.js";
|
||||
import type { FeedItem, MessageView } from "#lib/api/types.js";
|
||||
import FeedText from "#lib/components/feed/FeedText.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatDayTime, formatFull } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
item: FeedItem;
|
||||
onopen: (messageId: number) => void;
|
||||
senderOf: (message: MessageView) => string;
|
||||
}
|
||||
|
||||
let { item, onopen, senderOf }: Props = $props();
|
||||
|
||||
const PAGE = 50;
|
||||
|
||||
let messages = $state<MessageView[]>([]);
|
||||
let cursor = $state<string | null>(null);
|
||||
let loading = $state(false);
|
||||
let failed = $state(false);
|
||||
|
||||
async function load(next: string | null) {
|
||||
loading = true;
|
||||
failed = false;
|
||||
try {
|
||||
const page = await listFeedMessages(item.id, {
|
||||
cursor: next ?? undefined,
|
||||
limit: PAGE,
|
||||
});
|
||||
messages = [...messages, ...page.messages];
|
||||
cursor = page.next_cursor;
|
||||
} catch {
|
||||
failed = true;
|
||||
} finally {
|
||||
loading = false;
|
||||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
load(null);
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="bulk">
|
||||
{#each messages as message (message.message_id)}
|
||||
<button
|
||||
class="member"
|
||||
onclick={() => onopen(message.message_id)}
|
||||
type="button"
|
||||
use:ripple
|
||||
>
|
||||
<FeedText deleted {message} prefix={senderOf(message)} />
|
||||
<time
|
||||
class="date"
|
||||
datetime={message.date}
|
||||
title={formatFull(message.date)}
|
||||
>
|
||||
{formatDayTime(message.date)}
|
||||
</time>
|
||||
</button>
|
||||
{/each}
|
||||
{#if loading}
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if failed}
|
||||
<button class="more" onclick={() => load(cursor)} type="button">
|
||||
{t("feed.retry")}
|
||||
</button>
|
||||
{:else if cursor !== null}
|
||||
<button class="more" onclick={() => load(cursor)} type="button">
|
||||
{t("feed.more")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.bulk {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.125rem;
|
||||
|
||||
margin: 0 0 0.375rem 4.125rem;
|
||||
padding-inline-start: 0.625rem;
|
||||
border-inline-start: 2px solid var(--color-borders);
|
||||
}
|
||||
|
||||
.member {
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: baseline;
|
||||
|
||||
width: 100%;
|
||||
padding: 0.375rem 0.5rem;
|
||||
border: 0;
|
||||
border-radius: var(--border-radius-default-small);
|
||||
|
||||
font: inherit;
|
||||
text-align: start;
|
||||
color: var(--color-text);
|
||||
|
||||
background: none;
|
||||
|
||||
--ripple-color: var(--color-interactive-element-hover);
|
||||
|
||||
:global(.feed-text) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
&:hover {
|
||||
background-color: var(--color-chat-hover);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.date {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.state {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0.5rem 0;
|
||||
}
|
||||
|
||||
.more {
|
||||
cursor: pointer;
|
||||
|
||||
margin-top: 0.25rem;
|
||||
padding: 0.5rem;
|
||||
border: 0;
|
||||
border-radius: 0.5rem;
|
||||
|
||||
font: inherit;
|
||||
font-size: 0.875rem;
|
||||
color: var(--color-primary);
|
||||
|
||||
background-color: var(--color-background-secondary);
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,419 @@
|
||||
<script lang="ts">
|
||||
import { ripple } from "#lib/actions/ripple.js";
|
||||
import type { FeedItem, MessageView } from "#lib/api/types.js";
|
||||
import FeedBulk from "#lib/components/feed/FeedBulk.svelte";
|
||||
import FeedPhoto from "#lib/components/feed/FeedPhoto.svelte";
|
||||
import FeedText from "#lib/components/feed/FeedText.svelte";
|
||||
import Avatar from "#lib/components/ui/Avatar.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatFull, formatListDate } from "#lib/format/datetime.js";
|
||||
import { wordDiff } from "#lib/format/diff.js";
|
||||
import { peerName } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
|
||||
interface Props {
|
||||
inChat?: boolean;
|
||||
item: FeedItem;
|
||||
onopen: (messageId: number) => void;
|
||||
}
|
||||
|
||||
let { item, onopen, inChat = false }: Props = $props();
|
||||
|
||||
const FIELD_KEYS = {
|
||||
name: "feed.field.name",
|
||||
photo: "feed.field.photo",
|
||||
title: "feed.field.title",
|
||||
username: "feed.field.username",
|
||||
} as const;
|
||||
const FIELD_ORDER = ["name", "title", "username", "photo"] as const;
|
||||
|
||||
let expanded = $state(false);
|
||||
|
||||
const ownId = $derived(accounts.selected?.tg_user_id ?? null);
|
||||
const bulk = $derived(item.kind === "deleted" && item.message_count > 1);
|
||||
const isGroup = $derived(item.chat.kind === "group");
|
||||
|
||||
$effect(() => {
|
||||
if (item.sender_id !== null && item.sender_id > 0) {
|
||||
peers.ensure([item.sender_id]);
|
||||
}
|
||||
});
|
||||
|
||||
function senderName(senderId: number | null, fallback: string | null) {
|
||||
if (senderId === null) {
|
||||
return fallback ?? "";
|
||||
}
|
||||
if (senderId === ownId) {
|
||||
return t("chat.you");
|
||||
}
|
||||
const peer = peers.get(senderId);
|
||||
if (peer) {
|
||||
return peerName(peer);
|
||||
}
|
||||
return fallback ?? String(senderId);
|
||||
}
|
||||
|
||||
function shortName(senderId: number | null, fallback: string | null) {
|
||||
if (senderId === ownId) {
|
||||
return t("chat.you");
|
||||
}
|
||||
const peer = senderId === null ? undefined : peers.get(senderId);
|
||||
return peer?.first_name || senderName(senderId, fallback);
|
||||
}
|
||||
|
||||
function prefixOf(message: MessageView): string {
|
||||
if (message.sender_id === ownId) {
|
||||
return t("chat.you");
|
||||
}
|
||||
return isGroup ? shortName(message.sender_id, null) : "";
|
||||
}
|
||||
|
||||
const chatTitle = $derived(
|
||||
item.chat.title ??
|
||||
(item.chat.chat_id > 0
|
||||
? t("chat.deletedAccount")
|
||||
: t("chat.fallbackTitle", { id: item.chat.chat_id }))
|
||||
);
|
||||
const profile = $derived(item.kind === "profile");
|
||||
const fields = $derived(
|
||||
FIELD_ORDER.filter((field) => item.detail?.[field]).map(
|
||||
(field) => [field, item.detail?.[field] ?? [null, null]] as const
|
||||
)
|
||||
);
|
||||
const title = $derived.by(() => {
|
||||
if (!inChat || profile) {
|
||||
return chatTitle;
|
||||
}
|
||||
if (bulk) {
|
||||
return t("feed.bulk", { count: item.message_count });
|
||||
}
|
||||
return senderName(item.sender_id, item.sender_name);
|
||||
});
|
||||
const avatar = $derived.by(() => {
|
||||
if (!inChat || profile) {
|
||||
return {
|
||||
has: item.chat.has_avatar,
|
||||
id: item.chat.chat_id,
|
||||
kind: item.chat.chat_id > 0 ? ("peer" as const) : ("chat" as const),
|
||||
};
|
||||
}
|
||||
const id = item.sender_id ?? item.chat.chat_id;
|
||||
return {
|
||||
has: id > 0 ? (peers.get(id)?.has_avatar ?? false) : item.chat.has_avatar,
|
||||
id,
|
||||
kind: id > 0 ? ("peer" as const) : ("chat" as const),
|
||||
};
|
||||
});
|
||||
const prefix = $derived.by(() => {
|
||||
if (inChat || profile) {
|
||||
return "";
|
||||
}
|
||||
if (item.outgoing) {
|
||||
return t("chat.you");
|
||||
}
|
||||
return isGroup ? shortName(item.sender_id, item.sender_name) : "";
|
||||
});
|
||||
const sameText = $derived(item.has_before && item.before === item.after);
|
||||
const diff = $derived(
|
||||
item.kind === "edited" && item.has_before && !sameText
|
||||
? wordDiff(item.before ?? "", item.after ?? "")
|
||||
: null
|
||||
);
|
||||
|
||||
function shown(field: string, value: string | null): string {
|
||||
if (!value) {
|
||||
return t("feed.noText");
|
||||
}
|
||||
return field === "username" ? `@${value}` : value;
|
||||
}
|
||||
|
||||
function open() {
|
||||
if (bulk) {
|
||||
expanded = !expanded;
|
||||
return;
|
||||
}
|
||||
onopen(item.message_id);
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="feed-entry">
|
||||
<button
|
||||
aria-expanded={bulk ? expanded : undefined}
|
||||
class="row"
|
||||
onclick={open}
|
||||
type="button"
|
||||
use:ripple
|
||||
>
|
||||
{#if inChat && bulk}
|
||||
<span class="glyph"><Icon name="delete" size="1.5rem" /></span>
|
||||
{:else}
|
||||
<Avatar
|
||||
avatar={{ id: avatar.id, kind: avatar.kind }}
|
||||
colorKey={avatar.id}
|
||||
hasAvatar={avatar.has}
|
||||
name={title}
|
||||
size={3}
|
||||
/>
|
||||
{/if}
|
||||
<span class="body">
|
||||
<span class="top">
|
||||
<span class="title">{title}</span>
|
||||
<time datetime={item.at} title={formatFull(item.at)}>
|
||||
{formatListDate(item.at)}
|
||||
</time>
|
||||
</span>
|
||||
{#if profile}
|
||||
{#each fields as [field, pair] (field)}
|
||||
<span class="change now">
|
||||
<span class="tag">{t(FIELD_KEYS[field])}</span>
|
||||
{#if field === "photo"}
|
||||
<FeedPhoto ownerId={item.chat.chat_id} uniqueId={pair[0]} />
|
||||
<span class="arrow">→</span>
|
||||
<FeedPhoto ownerId={item.chat.chat_id} uniqueId={pair[1]} />
|
||||
{:else}
|
||||
<span class="was">{shown(field, pair[0])}</span>
|
||||
<span class="arrow">→</span>
|
||||
{shown(field, pair[1])}
|
||||
{/if}
|
||||
</span>
|
||||
{/each}
|
||||
{#if item.message_count > fields.length}
|
||||
<span class="count">
|
||||
{t("feed.profileCount", { count: item.message_count })}
|
||||
</span>
|
||||
{/if}
|
||||
{:else if bulk}
|
||||
<span class="mark">
|
||||
<Icon name="delete" size="0.875rem" />
|
||||
{inChat
|
||||
? t("feed.deleted")
|
||||
: t("feed.bulk", { count: item.message_count })}
|
||||
<span class="chevron" class:open={expanded}>
|
||||
<Icon name="down" size="1rem" />
|
||||
</span>
|
||||
</span>
|
||||
{#if !expanded}
|
||||
<FeedText deleted message={item.message} {prefix} />
|
||||
{/if}
|
||||
{:else if item.kind === "deleted"}
|
||||
<FeedText
|
||||
deleted
|
||||
mark={t("feed.deleted")}
|
||||
message={item.message}
|
||||
{prefix}
|
||||
/>
|
||||
{:else if sameText}
|
||||
<span class="mark edited">
|
||||
<Icon name="edit" size="0.875rem" />
|
||||
{t("feed.mediaChanged")}
|
||||
</span>
|
||||
<FeedText message={item.message} {prefix} />
|
||||
{:else}
|
||||
<span class="change">
|
||||
<span class="tag">{t("feed.before")}</span>
|
||||
{#if !item.has_before}
|
||||
<span class="missing">{t("feed.lostText")}</span>
|
||||
{:else if !item.before}
|
||||
<span class="missing">{t("feed.noText")}</span>
|
||||
{:else if diff}
|
||||
{#each diff.before as part, index (index)}
|
||||
<span class:removed={part.changed}>{part.text}</span>
|
||||
{/each}
|
||||
{:else}
|
||||
{item.before}
|
||||
{/if}
|
||||
</span>
|
||||
<span class="change now">
|
||||
<span class="tag">{t("feed.after")}</span>
|
||||
{#if prefix}
|
||||
<span class="prefix">{prefix}:</span>
|
||||
{/if}
|
||||
{#if !item.after}
|
||||
<span class="missing">{t("feed.noText")}</span>
|
||||
{:else if diff}
|
||||
{#each diff.after as part, index (index)}
|
||||
<span class:added={part.changed}>{part.text}</span>
|
||||
{/each}
|
||||
{:else}
|
||||
{item.after}
|
||||
{/if}
|
||||
</span>
|
||||
{/if}
|
||||
</span>
|
||||
</button>
|
||||
{#if bulk && expanded}
|
||||
{#key `${item.id}:${item.message_count}`}
|
||||
<FeedBulk {item} {onopen} senderOf={prefixOf} />
|
||||
{/key}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.row {
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
gap: 0.625rem;
|
||||
align-items: flex-start;
|
||||
|
||||
width: 100%;
|
||||
padding: 0.5625rem 0.5rem;
|
||||
border: 0;
|
||||
border-radius: var(--border-radius-default-small);
|
||||
|
||||
font: inherit;
|
||||
text-align: start;
|
||||
color: var(--color-text);
|
||||
|
||||
background-color: transparent;
|
||||
transition: background-color 0.15s ease;
|
||||
|
||||
--ripple-color: var(--color-interactive-element-hover);
|
||||
|
||||
@media (hover: hover) {
|
||||
&:hover {
|
||||
background-color: var(--color-chat-hover);
|
||||
}
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
.glyph {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
border-radius: 50%;
|
||||
|
||||
color: var(--color-white);
|
||||
|
||||
background-color: var(--color-gray);
|
||||
}
|
||||
|
||||
.body {
|
||||
display: flex;
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
gap: 0.125rem;
|
||||
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.top {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: baseline;
|
||||
}
|
||||
|
||||
.title {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
|
||||
font-size: 1rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
time {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.mark {
|
||||
display: inline-flex;
|
||||
gap: 0.25rem;
|
||||
align-items: center;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-error);
|
||||
|
||||
&.edited {
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
}
|
||||
|
||||
.chevron {
|
||||
display: inline-flex;
|
||||
color: var(--color-text-secondary);
|
||||
transition: transform 0.2s ease;
|
||||
|
||||
&.open {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
}
|
||||
|
||||
.change {
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
|
||||
font-size: 0.9375rem;
|
||||
line-height: 1.25rem;
|
||||
color: var(--color-text-secondary);
|
||||
overflow-wrap: anywhere;
|
||||
|
||||
-webkit-line-clamp: 3;
|
||||
line-clamp: 3;
|
||||
-webkit-box-orient: vertical;
|
||||
|
||||
&.now {
|
||||
color: var(--color-text);
|
||||
}
|
||||
}
|
||||
|
||||
.tag {
|
||||
margin-inline-end: 0.375rem;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.prefix {
|
||||
margin-inline-end: 0.25rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.removed {
|
||||
text-decoration: line-through;
|
||||
text-decoration-color: var(--color-error);
|
||||
}
|
||||
|
||||
.added {
|
||||
border-radius: 0.25rem;
|
||||
background-color: color-mix(in srgb, var(--color-primary) 22%, transparent);
|
||||
box-decoration-break: clone;
|
||||
}
|
||||
|
||||
.missing {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.was {
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.arrow {
|
||||
margin-inline: 0.25rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.count {
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,125 @@
|
||||
<script lang="ts">
|
||||
import type { FeedChatKind, FeedKind } from "#lib/api/types.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { FEED_CHAT_KINDS, FEED_KINDS } from "#lib/stores/feed.svelte.js";
|
||||
|
||||
interface Props {
|
||||
chats?: FeedChatKind | null;
|
||||
kind: FeedKind;
|
||||
onchats?: (chats: FeedChatKind | null) => void;
|
||||
onkind: (kind: FeedKind) => void;
|
||||
}
|
||||
|
||||
let { kind, chats = null, onkind, onchats }: Props = $props();
|
||||
|
||||
const KIND_KEYS = {
|
||||
all: "feed.filter.all",
|
||||
deleted: "feed.filter.deleted",
|
||||
edited: "feed.filter.edited",
|
||||
profile: "feed.filter.profile",
|
||||
} as const;
|
||||
|
||||
const CHAT_KEYS = {
|
||||
channel: "feed.chats.channel",
|
||||
dm: "feed.chats.dm",
|
||||
group: "feed.chats.group",
|
||||
} as const;
|
||||
</script>
|
||||
|
||||
<div class="filters">
|
||||
<div class="group">
|
||||
{#each FEED_KINDS as option (option)}
|
||||
<button
|
||||
aria-pressed={kind === option}
|
||||
class="chip"
|
||||
onclick={() => onkind(option)}
|
||||
type="button"
|
||||
class:on={kind === option}
|
||||
>
|
||||
{t(KIND_KEYS[option])}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
{#if onchats}
|
||||
<div class="group">
|
||||
{#each FEED_CHAT_KINDS as option (option)}
|
||||
<button
|
||||
aria-pressed={chats === option}
|
||||
class="chip"
|
||||
onclick={() => onchats(chats === option ? null : option)}
|
||||
type="button"
|
||||
class:on={chats === option}
|
||||
>
|
||||
{t(CHAT_KEYS[option])}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.filters {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.375rem 0.75rem;
|
||||
|
||||
padding: 0.625rem 1rem;
|
||||
border-bottom: 1px solid var(--color-borders);
|
||||
}
|
||||
|
||||
.group {
|
||||
display: inline-flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.25rem;
|
||||
}
|
||||
|
||||
.chip {
|
||||
cursor: pointer;
|
||||
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
|
||||
height: 1.75rem;
|
||||
padding: 0 0.625rem;
|
||||
border: 0;
|
||||
border-radius: 0.875rem;
|
||||
|
||||
font: inherit;
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text);
|
||||
white-space: nowrap;
|
||||
|
||||
background-color: var(--color-chat-hover);
|
||||
|
||||
transition:
|
||||
background-color 0.15s ease-out,
|
||||
box-shadow 0.15s ease-out;
|
||||
|
||||
&.on {
|
||||
background-color: color-mix(
|
||||
in srgb,
|
||||
var(--color-primary) 12%,
|
||||
transparent
|
||||
);
|
||||
box-shadow: inset 0 0 0 1px var(--color-primary);
|
||||
}
|
||||
|
||||
@media (pointer: coarse) {
|
||||
height: 2.25rem;
|
||||
padding: 0 0.75rem;
|
||||
border-radius: 1.125rem;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 1px;
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
&:not(.on):hover {
|
||||
background-color: var(--color-background-secondary-accent);
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,192 @@
|
||||
<script lang="ts">
|
||||
import { untrack } from "svelte";
|
||||
import { visible } from "#lib/actions/visible.js";
|
||||
import { type FeedQuery, listFeed } from "#lib/api/endpoints.js";
|
||||
import type { FeedChatKind, FeedItem, FeedKind } from "#lib/api/types.js";
|
||||
import FeedEntry from "#lib/components/feed/FeedEntry.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { feed } from "#lib/stores/feed.svelte.js";
|
||||
|
||||
interface Props {
|
||||
chatId?: number;
|
||||
chats?: FeedChatKind | null;
|
||||
kind: FeedKind;
|
||||
onopen: (item: FeedItem, messageId: number) => void;
|
||||
}
|
||||
|
||||
let { kind, chats = null, chatId, onopen }: Props = $props();
|
||||
|
||||
const PAGE = 30;
|
||||
const EMPTY_KEYS = {
|
||||
all: "feed.empty.all",
|
||||
deleted: "feed.empty.deleted",
|
||||
edited: "feed.empty.edited",
|
||||
profile: "feed.empty.profile",
|
||||
} as const;
|
||||
|
||||
let items = $state<FeedItem[]>([]);
|
||||
let cursor = $state<string | null>(null);
|
||||
let loading = $state(true);
|
||||
let failed = $state(false);
|
||||
let token = 0;
|
||||
let { revision } = feed;
|
||||
|
||||
const filter = $derived<FeedQuery>({
|
||||
chat_id: chatId,
|
||||
chat_kind: chats ?? undefined,
|
||||
kind,
|
||||
limit: PAGE,
|
||||
});
|
||||
let active: FeedQuery = {};
|
||||
|
||||
function byTime(a: FeedItem, b: FeedItem): number {
|
||||
return Date.parse(b.at) - Date.parse(a.at) || b.id - a.id;
|
||||
}
|
||||
|
||||
async function reload() {
|
||||
token += 1;
|
||||
const mine = token;
|
||||
loading = true;
|
||||
failed = false;
|
||||
try {
|
||||
const page = await listFeed(active);
|
||||
if (mine === token) {
|
||||
({ items } = page);
|
||||
cursor = page.next_cursor;
|
||||
}
|
||||
} catch {
|
||||
if (mine === token) {
|
||||
failed = true;
|
||||
}
|
||||
} finally {
|
||||
if (mine === token) {
|
||||
loading = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function more() {
|
||||
if (loading || cursor === null) {
|
||||
return;
|
||||
}
|
||||
const mine = token;
|
||||
loading = true;
|
||||
failed = false;
|
||||
try {
|
||||
const page = await listFeed({ ...active, cursor });
|
||||
if (mine === token) {
|
||||
const known = new Set(items.map((item) => item.id));
|
||||
items = [...items, ...page.items.filter((item) => !known.has(item.id))];
|
||||
cursor = page.next_cursor;
|
||||
}
|
||||
} catch {
|
||||
if (mine === token) {
|
||||
failed = true;
|
||||
}
|
||||
} finally {
|
||||
if (mine === token) {
|
||||
loading = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function refreshHead() {
|
||||
const mine = token;
|
||||
const page = await listFeed(active);
|
||||
if (mine !== token) {
|
||||
return;
|
||||
}
|
||||
const fresh = new Set(page.items.map((item) => item.id));
|
||||
const rest = items.filter((item) => !fresh.has(item.id));
|
||||
items = [...page.items, ...rest].sort(byTime);
|
||||
if (items.length === page.items.length) {
|
||||
cursor = page.next_cursor;
|
||||
}
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
const next = filter;
|
||||
if (accounts.selectedId === null) {
|
||||
return;
|
||||
}
|
||||
active = next;
|
||||
untrack(() => reload());
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
const next = feed.revision;
|
||||
if (next === revision) {
|
||||
return;
|
||||
}
|
||||
revision = next;
|
||||
untrack(() => refreshHead()).catch(() => undefined);
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="feed-list">
|
||||
{#if items.length === 0 && loading}
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if items.length === 0 && failed}
|
||||
<div class="state">
|
||||
<p>{t("feed.error")}</p>
|
||||
<Button onclick={reload} variant="text">{t("feed.retry")}</Button>
|
||||
</div>
|
||||
{:else if items.length === 0}
|
||||
<EmptyState title={t(EMPTY_KEYS[kind])} />
|
||||
{:else}
|
||||
{#each items as item (item.id)}
|
||||
<FeedEntry
|
||||
inChat={chatId !== undefined}
|
||||
{item}
|
||||
onopen={(messageId) => onopen(item, messageId)}
|
||||
/>
|
||||
{/each}
|
||||
{#if cursor !== null}
|
||||
{#if failed}
|
||||
<div class="state">
|
||||
<Button onclick={more} variant="text">{t("feed.retry")}</Button>
|
||||
</div>
|
||||
{:else}
|
||||
{#key cursor}
|
||||
<div class="state" use:visible={more}>
|
||||
{#if loading}
|
||||
<Spinner />
|
||||
{/if}
|
||||
</div>
|
||||
{/key}
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.feed-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 100%;
|
||||
padding: 0.25rem 0.4375rem 0.5rem;
|
||||
}
|
||||
|
||||
.state {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
min-height: 3rem;
|
||||
padding: 1rem;
|
||||
|
||||
color: var(--color-text-secondary);
|
||||
text-align: center;
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,64 @@
|
||||
<script lang="ts">
|
||||
import { loadAvatarVariant } from "#lib/api/avatars.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
|
||||
interface Props {
|
||||
ownerId: number;
|
||||
uniqueId: string | null;
|
||||
}
|
||||
|
||||
let { ownerId, uniqueId }: Props = $props();
|
||||
|
||||
let url = $state<string | null>(null);
|
||||
|
||||
$effect(() => {
|
||||
url = null;
|
||||
if (uniqueId === null) {
|
||||
return;
|
||||
}
|
||||
let active = true;
|
||||
loadAvatarVariant(ownerId > 0 ? "peer" : "chat", ownerId, uniqueId).then(
|
||||
(resolved) => {
|
||||
if (active) {
|
||||
url = resolved;
|
||||
}
|
||||
}
|
||||
);
|
||||
return () => {
|
||||
active = false;
|
||||
};
|
||||
});
|
||||
</script>
|
||||
|
||||
<span class="feed-photo">
|
||||
{#if url}
|
||||
<img alt="" src={url}>
|
||||
{:else}
|
||||
<Icon name="photo" size="0.875rem" />
|
||||
{/if}
|
||||
</span>
|
||||
|
||||
<style lang="scss">
|
||||
.feed-photo {
|
||||
overflow: hidden;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
width: 1.75rem;
|
||||
height: 1.75rem;
|
||||
border-radius: 50%;
|
||||
|
||||
vertical-align: middle;
|
||||
|
||||
color: var(--color-white);
|
||||
|
||||
background-color: var(--color-gray);
|
||||
}
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,216 @@
|
||||
<script lang="ts">
|
||||
import { ripple } from "#lib/actions/ripple.js";
|
||||
import type { FeedItem } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatListDate } from "#lib/format/datetime.js";
|
||||
import { mediaKindLabel } from "#lib/format/media.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { feed } from "#lib/stores/feed.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const BADGE_LIMIT = 10_000;
|
||||
|
||||
const latest = $derived(feed.unseen?.latest ?? null);
|
||||
const count = $derived(feed.unseen?.count ?? 0);
|
||||
const badge = $derived(
|
||||
count < BADGE_LIMIT
|
||||
? String(count)
|
||||
: new Intl.NumberFormat(locale.tag, { notation: "compact" }).format(count)
|
||||
);
|
||||
|
||||
$effect(() => {
|
||||
if (accounts.selectedId !== null) {
|
||||
feed.sync();
|
||||
}
|
||||
});
|
||||
|
||||
function chatTitle(item: FeedItem): string {
|
||||
return (
|
||||
item.chat.title ??
|
||||
(item.chat.chat_id > 0
|
||||
? t("chat.deletedAccount")
|
||||
: t("chat.fallbackTitle", { id: item.chat.chat_id }))
|
||||
);
|
||||
}
|
||||
|
||||
function summary(item: FeedItem): string {
|
||||
if (item.kind === "deleted" && item.message_count > 1) {
|
||||
return t("feed.bulk", { count: item.message_count });
|
||||
}
|
||||
const text = item.kind === "edited" ? item.after : item.message?.text;
|
||||
const media = item.message?.media[0]?.kind ?? null;
|
||||
return text?.trim() || mediaKindLabel(media) || t("feed.noText");
|
||||
}
|
||||
</script>
|
||||
|
||||
<button
|
||||
class="feed-row"
|
||||
onclick={() => feed.open(page.url)}
|
||||
type="button"
|
||||
use:ripple
|
||||
>
|
||||
<span class="avatar"><Icon name="recent" /></span>
|
||||
<span class="info">
|
||||
<span class="info-row">
|
||||
<span class="title">{t("feed.title")}</span>
|
||||
{#if latest}
|
||||
<span class="date">{formatListDate(latest.at)}</span>
|
||||
{/if}
|
||||
</span>
|
||||
<span class="subtitle">
|
||||
<span class="preview">
|
||||
{#if latest}
|
||||
<Icon
|
||||
class="kind"
|
||||
name={latest.kind === "deleted" ? "delete" : "edit"}
|
||||
size="0.875rem"
|
||||
/>
|
||||
<span class="chat">{chatTitle(latest)}:</span>
|
||||
<span
|
||||
class:struck={latest.kind === "deleted" &&
|
||||
latest.message_count === 1}
|
||||
>{summary(latest)}</span
|
||||
>
|
||||
{:else}
|
||||
{t("feed.empty.all")}
|
||||
{/if}
|
||||
</span>
|
||||
{#if count > 0}
|
||||
<span class="badge">{badge}</span>
|
||||
{/if}
|
||||
</span>
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<style lang="scss">
|
||||
.feed-row {
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
gap: 0.625rem;
|
||||
align-items: center;
|
||||
|
||||
width: 100%;
|
||||
height: 4.5rem;
|
||||
padding: 0.5625rem 0.5rem;
|
||||
border: 0;
|
||||
border-radius: 0.625rem;
|
||||
|
||||
font: inherit;
|
||||
text-align: start;
|
||||
color: var(--color-text);
|
||||
|
||||
background-color: transparent;
|
||||
transition: background-color 0.15s ease;
|
||||
|
||||
--ripple-color: var(--color-interactive-element-hover);
|
||||
|
||||
@media (hover: hover) {
|
||||
&:hover {
|
||||
background-color: var(--color-chat-hover);
|
||||
}
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
.avatar {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
width: 3.375rem;
|
||||
height: 3.375rem;
|
||||
border-radius: 50%;
|
||||
|
||||
font-size: 1.75rem;
|
||||
color: var(--color-white);
|
||||
|
||||
background-color: var(--color-gray);
|
||||
}
|
||||
|
||||
.info {
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.info-row {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: baseline;
|
||||
}
|
||||
|
||||
.title {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
|
||||
font-size: 1rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.date {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: center;
|
||||
margin-top: 0.125rem;
|
||||
}
|
||||
|
||||
.preview {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
|
||||
font-size: 0.875rem;
|
||||
color: var(--color-text-secondary);
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
:global(.kind) {
|
||||
margin-inline-end: 0.125rem;
|
||||
vertical-align: -0.125rem;
|
||||
}
|
||||
}
|
||||
|
||||
.chat {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.struck {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
.badge {
|
||||
flex-shrink: 0;
|
||||
|
||||
min-width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
padding: 0 0.4375rem;
|
||||
border-radius: 0.75rem;
|
||||
|
||||
font-size: 0.875rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
font-variant-numeric: tabular-nums;
|
||||
line-height: 1.5rem;
|
||||
color: var(--color-white);
|
||||
text-align: center;
|
||||
|
||||
background-color: var(--color-gray);
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,128 @@
|
||||
<script lang="ts">
|
||||
import { mediaUrl } from "#lib/api/client.js";
|
||||
import type { MessageView } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { mediaKindLabel } from "#lib/format/media.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
deleted?: boolean;
|
||||
mark?: string;
|
||||
message: MessageView | null;
|
||||
prefix?: string;
|
||||
}
|
||||
|
||||
let { message, deleted = false, mark = "", prefix = "" }: Props = $props();
|
||||
|
||||
const media = $derived(message?.media[0] ?? null);
|
||||
const thumb = $derived(
|
||||
media?.kind === "photo" && media.downloaded && media.id !== null
|
||||
? mediaUrl(media.id)
|
||||
: null
|
||||
);
|
||||
const kind = $derived.by(() => {
|
||||
if (message?.poll) {
|
||||
return "poll";
|
||||
}
|
||||
if (message?.contact) {
|
||||
return "contact";
|
||||
}
|
||||
if (message?.location) {
|
||||
return "location";
|
||||
}
|
||||
if (message?.sticker) {
|
||||
return "sticker";
|
||||
}
|
||||
return media?.kind ?? (message?.has_media ? "other" : null);
|
||||
});
|
||||
const label = $derived(
|
||||
message?.sticker?.emoji
|
||||
? `${message.sticker.emoji} ${mediaKindLabel(kind)}`
|
||||
: mediaKindLabel(kind)
|
||||
);
|
||||
const text = $derived(message?.text?.trim() || message?.poll?.question || "");
|
||||
const lead = $derived.by(() => {
|
||||
if (!label || (thumb && text)) {
|
||||
return "";
|
||||
}
|
||||
return text ? `${label}, ` : label;
|
||||
});
|
||||
</script>
|
||||
|
||||
<span class="feed-text" class:deleted>
|
||||
{#if mark}
|
||||
<span class="mark"><Icon name="delete" size="0.875rem" /> {mark}</span>
|
||||
{/if}
|
||||
{#if prefix}
|
||||
<span class="prefix">{prefix}: </span>
|
||||
{/if}
|
||||
{#if thumb}
|
||||
<img alt="" class="thumb" decoding="async" loading="lazy" src={thumb}>
|
||||
{/if}
|
||||
{#if lead}
|
||||
<span class="label">{lead}</span>
|
||||
{/if}
|
||||
{#if text}
|
||||
<span class="body">{text}</span>
|
||||
{:else if !lead}
|
||||
<span class="empty">{t("feed.noText")}</span>
|
||||
{/if}
|
||||
</span>
|
||||
|
||||
<style lang="scss">
|
||||
.feed-text {
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
|
||||
font-size: 0.9375rem;
|
||||
line-height: 1.25rem;
|
||||
color: var(--color-text-secondary);
|
||||
overflow-wrap: anywhere;
|
||||
|
||||
-webkit-line-clamp: 2;
|
||||
line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
|
||||
.prefix {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.mark {
|
||||
margin-inline-end: 0.375rem;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-error);
|
||||
|
||||
:global(.icon) {
|
||||
vertical-align: -0.125rem;
|
||||
}
|
||||
}
|
||||
|
||||
.deleted .body,
|
||||
.deleted .label {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
.thumb {
|
||||
display: inline-block;
|
||||
|
||||
width: 1.25rem;
|
||||
height: 1.25rem;
|
||||
margin-inline-end: 0.25rem;
|
||||
border-radius: 0.25rem;
|
||||
|
||||
vertical-align: -0.25rem;
|
||||
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.label {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.empty {
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,97 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from "svelte";
|
||||
import type { FeedItem } from "#lib/api/types.js";
|
||||
import FeedFilters from "#lib/components/feed/FeedFilters.svelte";
|
||||
import FeedList from "#lib/components/feed/FeedList.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import {
|
||||
type FeedFilter,
|
||||
feed,
|
||||
messageHref,
|
||||
} from "#lib/stores/feed.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { goto } from "$app/navigation";
|
||||
import { page } from "$app/state";
|
||||
|
||||
interface Props {
|
||||
filter: FeedFilter;
|
||||
}
|
||||
|
||||
let { filter }: Props = $props();
|
||||
|
||||
async function open(item: FeedItem, messageId: number) {
|
||||
await goto(messageHref(page.url, item.chat.chat_id, messageId));
|
||||
if (item.kind === "profile" && !messageId) {
|
||||
ui.openPanel("profile");
|
||||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
feed.refresh().catch(() => undefined);
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
const { unseen } = feed;
|
||||
if (unseen && unseen.count > 0) {
|
||||
feed.markSeen(unseen.latest?.at).catch(() => undefined);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="feed-view">
|
||||
<header class="feed-header">
|
||||
<Button
|
||||
aria-label={t("common.back")}
|
||||
onclick={() => feed.close(page.url)}
|
||||
round
|
||||
smaller
|
||||
variant="translucent"
|
||||
>
|
||||
<Icon name="arrow-left" />
|
||||
</Button>
|
||||
<h2>{t("feed.title")}</h2>
|
||||
</header>
|
||||
<FeedFilters
|
||||
chats={filter.chats}
|
||||
kind={filter.kind}
|
||||
onchats={(chats) => feed.filter(page.url, { ...filter, chats })}
|
||||
onkind={(kind) => feed.filter(page.url, { ...filter, kind })}
|
||||
/>
|
||||
<div class="feed-body custom-scroll">
|
||||
<FeedList chats={filter.chats} kind={filter.kind} onopen={open} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.feed-view {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
overflow: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.feed-header {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
gap: 0.75rem;
|
||||
align-items: center;
|
||||
|
||||
height: var(--header-height);
|
||||
padding: 0 0.625rem;
|
||||
border-bottom: 1px solid var(--color-borders);
|
||||
|
||||
h2 {
|
||||
margin: 0;
|
||||
font-size: 1.25rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
}
|
||||
}
|
||||
|
||||
.feed-body {
|
||||
overflow-y: auto;
|
||||
flex: 1;
|
||||
}
|
||||
</style>
|
||||
@@ -3,7 +3,10 @@
|
||||
import type { JobStatus, JobView } from "#lib/api/types.js";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatFull } from "#lib/format/datetime.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -14,25 +17,22 @@
|
||||
|
||||
const POLL_MS = 2000;
|
||||
|
||||
const KIND_LABELS: Record<string, string> = {
|
||||
backfill: "Бэкфилл",
|
||||
backfill_stories: "Бэкфилл сторис",
|
||||
enrich_chat: "Обогащение чата",
|
||||
fetch_avatar: "Аватар",
|
||||
fetch_custom_emoji: "Кастом-эмодзи",
|
||||
fetch_media: "Докачка медиа",
|
||||
sync_dialogs: "Синхронизация диалогов",
|
||||
transcribe: "Расшифровка",
|
||||
const KIND_KEYS: Record<string, MessageKey> = {
|
||||
backfill: "jobs.kind.backfill",
|
||||
backfill_stories: "jobs.kind.backfill_stories",
|
||||
enrich_chat: "jobs.kind.enrich_chat",
|
||||
fetch_avatar: "jobs.kind.fetch_avatar",
|
||||
fetch_custom_emoji: "jobs.kind.fetch_custom_emoji",
|
||||
fetch_media: "jobs.kind.fetch_media",
|
||||
fetch_read_info: "jobs.kind.fetch_read_info",
|
||||
sync_contacts: "jobs.kind.sync_contacts",
|
||||
sync_dialogs: "jobs.kind.sync_dialogs",
|
||||
transcribe: "jobs.kind.transcribe",
|
||||
};
|
||||
|
||||
const STATUS_LABELS: Record<JobStatus, string> = {
|
||||
canceled: "Отменено",
|
||||
done: "Готово",
|
||||
failed: "Ошибка",
|
||||
paused: "Пауза",
|
||||
pending: "В очереди",
|
||||
running: "Выполняется",
|
||||
};
|
||||
function statusLabel(status: JobStatus): string {
|
||||
return t(`jobs.status.${status}`);
|
||||
}
|
||||
|
||||
let jobs = $state<JobView[]>([]);
|
||||
let loading = $state(true);
|
||||
@@ -56,7 +56,7 @@
|
||||
await cancelJob(job.id);
|
||||
await load();
|
||||
} catch {
|
||||
toasts.error("Не удалось остановить задачу");
|
||||
toasts.error(t("jobs.stopFailed"));
|
||||
} finally {
|
||||
canceling = null;
|
||||
}
|
||||
@@ -76,16 +76,22 @@
|
||||
|
||||
async function load() {
|
||||
jobs = await listJobs();
|
||||
chats.ensureMany(
|
||||
jobs.map(chatId).filter((id): id is number => id !== null)
|
||||
);
|
||||
loading = false;
|
||||
schedule();
|
||||
}
|
||||
|
||||
function kindLabel(job: JobView): string {
|
||||
const label = KIND_LABELS[job.kind] ?? job.kind;
|
||||
const key = KIND_KEYS[job.kind];
|
||||
const kind = key ? t(key) : job.kind;
|
||||
if (job.kind !== "backfill") {
|
||||
return label;
|
||||
return kind;
|
||||
}
|
||||
return job.params.full ? `${label} (полный)` : `${label} (новые)`;
|
||||
return job.params.full
|
||||
? t("jobs.kind.full", { kind })
|
||||
: t("jobs.kind.newer", { kind });
|
||||
}
|
||||
|
||||
function processed(job: JobView): number | null {
|
||||
@@ -98,6 +104,10 @@
|
||||
return typeof value === "number" ? value : null;
|
||||
}
|
||||
|
||||
function chatLabel(id: number): string {
|
||||
return chats.byId(id)?.title ?? t("jobs.chat", { id });
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
if (version >= 0 && accounts.selectedId !== null) {
|
||||
load().catch(() => {
|
||||
@@ -116,10 +126,12 @@
|
||||
{#if loading}
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if jobs.length === 0}
|
||||
<div class="state empty">Задач нет</div>
|
||||
<div class="state empty">{t("jobs.empty")}</div>
|
||||
{:else}
|
||||
<div class="jobs">
|
||||
{#each jobs as job (job.id)}
|
||||
{@const chat = chatId(job)}
|
||||
{@const count = processed(job)}
|
||||
<div class="job">
|
||||
<div class="job-head">
|
||||
<span class="kind">{kindLabel(job)}</span>
|
||||
@@ -130,20 +142,22 @@
|
||||
onclick={() => cancel(job)}
|
||||
type="button"
|
||||
>
|
||||
Стоп
|
||||
{t("jobs.stop")}
|
||||
</button>
|
||||
{/if}
|
||||
<span class="badge {job.status}">{STATUS_LABELS[job.status]}</span>
|
||||
<span class="badge {job.status}">{statusLabel(job.status)}</span>
|
||||
</div>
|
||||
<div class="meta">
|
||||
{#if chatId(job) !== null}
|
||||
<span>чат {chatId(job)}</span>
|
||||
{#if chat !== null}
|
||||
<span>{chatLabel(chat)}</span>
|
||||
{/if}
|
||||
{#if processed(job) !== null}
|
||||
<span>обработано {processed(job)}</span>
|
||||
{#if count !== null}
|
||||
<span>
|
||||
{t("jobs.processed", { count: count.toLocaleString(locale.tag) })}
|
||||
</span>
|
||||
{/if}
|
||||
{#if job.flood_waits > 0}
|
||||
<span>flood-wait {job.flood_waits}</span>
|
||||
<span>{t("jobs.floodWaits", { count: job.flood_waits })}</span>
|
||||
{/if}
|
||||
<span class="time">{formatFull(job.created_at)}</span>
|
||||
</div>
|
||||
|
||||
@@ -8,8 +8,10 @@
|
||||
import JobList from "#lib/components/jobs/JobList.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { createChatPicker } from "#lib/stores/chat-picker.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
import { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
@@ -23,6 +25,7 @@
|
||||
let starting = $state(false);
|
||||
let syncing = $state(false);
|
||||
let syncingContacts = $state(false);
|
||||
const started = createFlash<"backfill" | "sync" | "contacts">();
|
||||
|
||||
const picker = createChatPicker();
|
||||
const availableChats = $derived(picker.results);
|
||||
@@ -39,9 +42,9 @@
|
||||
|
||||
function chatTitle(id: number | null): string {
|
||||
if (id === null) {
|
||||
return "Чат не выбран";
|
||||
return t("jobs.noChat");
|
||||
}
|
||||
return chats.byId(id)?.title ?? `Чат ${id}`;
|
||||
return chats.byId(id)?.title ?? t("ui.chat", { id });
|
||||
}
|
||||
|
||||
function selectChat(id: number) {
|
||||
@@ -57,10 +60,10 @@
|
||||
starting = true;
|
||||
try {
|
||||
await enqueueBackfill(selected, media, true);
|
||||
toasts.success("Полный бэкфилл запущен");
|
||||
started.show("backfill");
|
||||
version += 1;
|
||||
} catch {
|
||||
toasts.error("Не удалось запустить бэкфилл");
|
||||
toasts.error(t("jobs.backfillFailed"));
|
||||
} finally {
|
||||
starting = false;
|
||||
}
|
||||
@@ -73,10 +76,10 @@
|
||||
syncing = true;
|
||||
try {
|
||||
await syncDialogs();
|
||||
toasts.success("Синхронизация диалогов запущена");
|
||||
started.show("sync");
|
||||
version += 1;
|
||||
} catch {
|
||||
toasts.error("Не удалось синхронизировать диалоги");
|
||||
toasts.error(t("jobs.syncFailed"));
|
||||
} finally {
|
||||
syncing = false;
|
||||
}
|
||||
@@ -89,10 +92,10 @@
|
||||
syncingContacts = true;
|
||||
try {
|
||||
await syncContacts();
|
||||
toasts.success("Синхронизация контактов запущена");
|
||||
started.show("contacts");
|
||||
version += 1;
|
||||
} catch {
|
||||
toasts.error("Не удалось синхронизировать контакты");
|
||||
toasts.error(t("jobs.contactsFailed"));
|
||||
} finally {
|
||||
syncingContacts = false;
|
||||
}
|
||||
@@ -105,21 +108,20 @@
|
||||
|
||||
<div class="panel">
|
||||
<section>
|
||||
<div class="section-title">Диалоги</div>
|
||||
<p class="hint">
|
||||
Синхронизация подтягивает все диалоги аккаунта — старые чаты станут видны
|
||||
и доступны для бэкфилла.
|
||||
</p>
|
||||
<div class="section-title">{t("jobs.dialogs")}</div>
|
||||
<p class="hint">{t("jobs.dialogsHint")}</p>
|
||||
<div class="action">
|
||||
<Button fluid loading={syncing} onclick={sync} variant="secondary">
|
||||
<Icon name="reload" />
|
||||
<span>Синхронизировать диалоги</span>
|
||||
{#if started.current === "sync"}
|
||||
<Icon name="check" />
|
||||
<span>{t("jobs.status.pending")}</span>
|
||||
{:else}
|
||||
<Icon name="reload" />
|
||||
<span>{t("jobs.syncDialogs")}</span>
|
||||
{/if}
|
||||
</Button>
|
||||
</div>
|
||||
<p class="hint">
|
||||
Контакты подтягиваются отдельно — тогда в поиске появятся люди, с которыми
|
||||
ещё не было переписки.
|
||||
</p>
|
||||
<p class="hint">{t("jobs.contactsHint")}</p>
|
||||
<div class="action">
|
||||
<Button
|
||||
fluid
|
||||
@@ -127,18 +129,20 @@
|
||||
onclick={syncContactList}
|
||||
variant="secondary"
|
||||
>
|
||||
<Icon name="user" />
|
||||
<span>Синхронизировать контакты</span>
|
||||
{#if started.current === "contacts"}
|
||||
<Icon name="check" />
|
||||
<span>{t("jobs.status.pending")}</span>
|
||||
{:else}
|
||||
<Icon name="user" />
|
||||
<span>{t("jobs.syncContacts")}</span>
|
||||
{/if}
|
||||
</Button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<div class="section-title">Бэкфилл</div>
|
||||
<p class="hint">
|
||||
Полный бэкфилл перечитывает всю историю чата с самого начала. Кнопка в
|
||||
шапке чата догружает только сообщения новее последнего сохранённого.
|
||||
</p>
|
||||
<div class="section-title">{t("jobs.backfill")}</div>
|
||||
<p class="hint">{t("jobs.backfillHint")}</p>
|
||||
|
||||
<button
|
||||
class="select"
|
||||
@@ -155,8 +159,9 @@
|
||||
{#if picking}
|
||||
<div class="picker">
|
||||
<input
|
||||
aria-label={t("ui.searchChat")}
|
||||
class="filter"
|
||||
placeholder="Поиск чата"
|
||||
placeholder={t("ui.searchChat")}
|
||||
type="text"
|
||||
bind:value={filter}
|
||||
>
|
||||
@@ -166,7 +171,7 @@
|
||||
onclick={() => selectChat(chat.chat_id)}
|
||||
type="button"
|
||||
>
|
||||
{chat.title ?? `Чат ${chat.chat_id}`}
|
||||
{chat.title ?? t("ui.chat", { id: chat.chat_id })}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
@@ -181,7 +186,7 @@
|
||||
role="switch"
|
||||
type="button"
|
||||
>
|
||||
<span class="label">Скачивать медиа</span>
|
||||
<span class="label">{t("jobs.downloadMedia")}</span>
|
||||
<span class="switch" class:on={media}>
|
||||
<span class="knob"></span>
|
||||
</span>
|
||||
@@ -195,14 +200,19 @@
|
||||
onclick={start}
|
||||
variant="primary"
|
||||
>
|
||||
<Icon name="cloud-download" />
|
||||
<span>Запустить полный бэкфилл</span>
|
||||
{#if started.current === "backfill"}
|
||||
<Icon name="check" />
|
||||
<span>{t("jobs.status.pending")}</span>
|
||||
{:else}
|
||||
<Icon name="cloud-download" />
|
||||
<span>{t("jobs.startBackfill")}</span>
|
||||
{/if}
|
||||
</Button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<div class="section-title">Задачи</div>
|
||||
<div class="section-title">{t("jobs.title")}</div>
|
||||
<JobList {version} />
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
import type { MediaRef } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { poster } from "#lib/media/poster.js";
|
||||
import { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -23,7 +25,17 @@
|
||||
let loaded = $state(false);
|
||||
let inline = $state<InlineMedia | null>(null);
|
||||
let queuing = $state(false);
|
||||
const queued = createFlash<true>();
|
||||
|
||||
const queueIcon = $derived.by(() => {
|
||||
if (queuing) {
|
||||
return "timer";
|
||||
}
|
||||
return queued.current ? "check" : "download";
|
||||
});
|
||||
const queueLabel = $derived(
|
||||
queued.current ? t("chat.media.queued") : t("media.downloadToArchive")
|
||||
);
|
||||
const ready = $derived(inline?.state === "ready" ? inline : null);
|
||||
const isVideo = $derived(ready ? visualKind(ready.kind) === "video" : false);
|
||||
|
||||
@@ -39,9 +51,9 @@
|
||||
queuing = true;
|
||||
try {
|
||||
await fetchMedia(chatId, media.message_id);
|
||||
toasts.success("Download queued");
|
||||
queued.show(true);
|
||||
} catch {
|
||||
toasts.error("Failed to queue download");
|
||||
toasts.error(t("media.queueFailed"));
|
||||
} finally {
|
||||
queuing = false;
|
||||
}
|
||||
@@ -62,11 +74,17 @@
|
||||
</button>
|
||||
{:else if ready}
|
||||
<button class="tile" onclick={onopen} type="button">
|
||||
<img alt="attachment" src={ready.url}>
|
||||
<img alt={t("media.attachment")} src={ready.url}>
|
||||
</button>
|
||||
{:else if inline?.state === "not-downloaded"}
|
||||
<button class="tile placeholder" onclick={queue} type="button">
|
||||
<Icon name={queuing ? "timer" : "download"} size="1.5rem" />
|
||||
<button
|
||||
aria-label={queueLabel}
|
||||
class="tile placeholder"
|
||||
onclick={queue}
|
||||
title={queueLabel}
|
||||
type="button"
|
||||
>
|
||||
<Icon name={queueIcon} size="1.5rem" />
|
||||
</button>
|
||||
{:else if loaded}
|
||||
<div class="tile placeholder"><Icon name="photo" size="1.5rem" /></div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatDuration } from "#lib/format/duration.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { claimPlayback, releasePlayback } from "#lib/media/playback.js";
|
||||
|
||||
interface Props {
|
||||
@@ -41,7 +42,12 @@
|
||||
</script>
|
||||
|
||||
<div class="Audio" class:own>
|
||||
<button aria-label="Play audio" class="toggle" onclick={toggle} type="button">
|
||||
<button
|
||||
aria-label={paused ? t("ui.play") : t("ui.pause")}
|
||||
class="toggle"
|
||||
onclick={toggle}
|
||||
type="button"
|
||||
>
|
||||
<Icon name={paused ? "play" : "pause"} size="1.625rem" />
|
||||
</button>
|
||||
<div class="content">
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import type { MediaRef } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatBytes, mediaKindLabel } from "#lib/format/media.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { shareUi } from "#lib/stores/shares.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
@@ -16,7 +17,7 @@
|
||||
let saving = $state(false);
|
||||
|
||||
const name = $derived(
|
||||
media.file_name ?? mediaKindLabel(media.kind) ?? "Файл"
|
||||
media.file_name ?? mediaKindLabel(media.kind) ?? t("media.kind.document")
|
||||
);
|
||||
const size = $derived(formatBytes(media.file_size));
|
||||
|
||||
@@ -28,7 +29,7 @@
|
||||
try {
|
||||
await downloadMedia(media.id);
|
||||
} catch {
|
||||
toasts.error("Не удалось скачать файл");
|
||||
toasts.error(t("ui.downloadFailed"));
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -52,7 +53,7 @@
|
||||
</span>
|
||||
</button>
|
||||
<button
|
||||
aria-label="Доступ по ссылке"
|
||||
aria-label={t("ui.shareLink")}
|
||||
class="file-share"
|
||||
onclick={share}
|
||||
type="button"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatDuration } from "#lib/format/duration.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { claimPlayback, releasePlayback } from "#lib/media/playback.js";
|
||||
import { POSTER_TIME, poster } from "#lib/media/poster.js";
|
||||
|
||||
@@ -38,7 +39,7 @@
|
||||
|
||||
<div class="RoundVideoWrap">
|
||||
<button
|
||||
aria-label="Play video message"
|
||||
aria-label={paused ? t("media.playRound") : t("ui.pause")}
|
||||
class="RoundVideo"
|
||||
onclick={toggle}
|
||||
type="button"
|
||||
@@ -87,7 +88,7 @@
|
||||
class:active={showTranscript}
|
||||
>
|
||||
<Icon name="transcribe" size="1rem" />
|
||||
Transcription
|
||||
{t("media.transcription")}
|
||||
</button>
|
||||
{#if showTranscript}
|
||||
<div class="transcript">{transcript}</div>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatDuration } from "#lib/format/duration.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { claimPlayback, releasePlayback } from "#lib/media/playback.js";
|
||||
import { computeWaveform, flatWaveform } from "#lib/media/waveform.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
@@ -38,10 +39,10 @@
|
||||
fetched = result;
|
||||
showTranscript = true;
|
||||
} else {
|
||||
toasts.error("Не удалось расшифровать");
|
||||
toasts.error(t("media.transcribeFailed"));
|
||||
}
|
||||
} catch {
|
||||
toasts.error("Не удалось расшифровать");
|
||||
toasts.error(t("media.transcribeFailed"));
|
||||
} finally {
|
||||
pending = false;
|
||||
}
|
||||
@@ -96,7 +97,7 @@
|
||||
<div class="VoiceWrap" class:own>
|
||||
<div class="Voice">
|
||||
<button
|
||||
aria-label="Play voice"
|
||||
aria-label={paused ? t("media.playVoice") : t("ui.pause")}
|
||||
class="toggle"
|
||||
onclick={toggle}
|
||||
type="button"
|
||||
@@ -121,7 +122,9 @@
|
||||
<div class="time">{formatDuration(elapsed)}</div>
|
||||
</div>
|
||||
<button
|
||||
aria-label="Show transcription"
|
||||
aria-label={showTranscript && text
|
||||
? t("media.hideTranscription")
|
||||
: t("media.showTranscription")}
|
||||
class="transcribe"
|
||||
disabled={pending}
|
||||
onclick={onTranscribe}
|
||||
|
||||
@@ -24,9 +24,11 @@
|
||||
sameToggles,
|
||||
summary,
|
||||
TOGGLE_KEYS,
|
||||
TOGGLE_LABELS,
|
||||
type ToggleKey,
|
||||
toggleLabel,
|
||||
} from "#lib/format/policy.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
|
||||
interface Props {
|
||||
onchange?: () => void;
|
||||
@@ -44,17 +46,17 @@
|
||||
onchange,
|
||||
}: Props = $props();
|
||||
|
||||
const PRESETS: { label: string; toggles: CaptureToggles }[] = [
|
||||
{ label: "Всё", toggles: preset("all") },
|
||||
{ label: "Только сообщения", toggles: preset(["messages"]) },
|
||||
{ label: "Ничего", toggles: preset([]) },
|
||||
const PRESETS: { label: MessageKey; toggles: CaptureToggles }[] = [
|
||||
{ label: "policy.summary.all", toggles: preset("all") },
|
||||
{ label: "policy.summary.messagesOnly", toggles: preset(["messages"]) },
|
||||
{ label: "policy.summary.none", toggles: preset([]) },
|
||||
];
|
||||
|
||||
let rule = $state<PolicyRecord | null>(null);
|
||||
let parent = $state<PolicyParent | null>(null);
|
||||
let loading = $state(false);
|
||||
let saving = $state(false);
|
||||
let problem = $state<string | null>(null);
|
||||
let problem = $state<MessageKey | null>(null);
|
||||
let removing = $state(false);
|
||||
|
||||
const isChat = $derived(scopeType === "chat");
|
||||
@@ -79,13 +81,14 @@
|
||||
if (isChat && parent) {
|
||||
const from = parentLabel(parent.scope_type, parent.title);
|
||||
return rule
|
||||
? `Без правила было бы как ${from}: ${summary(parent.toggles).toLowerCase()}.`
|
||||
: `Сейчас как ${from}. Измени что-нибудь, и у чата появится своё правило.`;
|
||||
? t("policy.hint.chatRule", {
|
||||
from,
|
||||
summary: summary(parent.toggles).toLocaleLowerCase(locale.tag),
|
||||
})
|
||||
: t("policy.hint.chatInherit", { from });
|
||||
}
|
||||
if (isFolder) {
|
||||
return rule
|
||||
? "Действует на чаты папки, у которых нет своего правила."
|
||||
: "У папки нет правила, чаты идут по умолчаниям. Выбери набор, чтобы его создать.";
|
||||
return rule ? t("policy.hint.folderRule") : t("policy.hint.folderNone");
|
||||
}
|
||||
return "";
|
||||
}
|
||||
@@ -112,7 +115,7 @@
|
||||
});
|
||||
onchange?.();
|
||||
} catch {
|
||||
problem = "Не удалось сохранить правило";
|
||||
problem = "policy.rule.saveFailed";
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -136,7 +139,7 @@
|
||||
removing = false;
|
||||
onchange?.();
|
||||
} catch {
|
||||
problem = "Не удалось удалить правило";
|
||||
problem = "policy.rule.deleteFailed";
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -153,7 +156,7 @@
|
||||
try {
|
||||
({ rule, parent } = await getPolicyScope(target));
|
||||
} catch {
|
||||
problem = "Не удалось загрузить правило";
|
||||
problem = "policy.rule.loadFailed";
|
||||
} finally {
|
||||
loading = false;
|
||||
}
|
||||
@@ -179,7 +182,7 @@
|
||||
type="button"
|
||||
class:on={shown !== null && sameToggles(shown, item.toggles)}
|
||||
>
|
||||
{item.label}
|
||||
{t(item.label)}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
@@ -196,7 +199,7 @@
|
||||
type="button"
|
||||
class:changed={differs(key)}
|
||||
>
|
||||
<span class="label">{TOGGLE_LABELS[key]}</span>
|
||||
<span class="label">{toggleLabel(key)}</span>
|
||||
<span class="switch" class:on={shown[key]}>
|
||||
<span class="knob"></span>
|
||||
</span>
|
||||
@@ -206,7 +209,7 @@
|
||||
{/if}
|
||||
|
||||
{#if problem}
|
||||
<p class="problem">{problem}</p>
|
||||
<p class="problem">{t(problem)}</p>
|
||||
{/if}
|
||||
|
||||
{#if target}
|
||||
@@ -216,7 +219,7 @@
|
||||
{#if rule && (isChat || isFolder)}
|
||||
{#if removing}
|
||||
<div class="removal">
|
||||
<span>Удалить правило?</span>
|
||||
<span>{t("policy.rule.removeConfirm")}</span>
|
||||
<Button
|
||||
onclick={() => {
|
||||
removing = false;
|
||||
@@ -224,7 +227,7 @@
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
Отмена
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
<Button
|
||||
disabled={saving}
|
||||
@@ -233,7 +236,7 @@
|
||||
smaller
|
||||
variant="danger"
|
||||
>
|
||||
Удалить
|
||||
{t("common.delete")}
|
||||
</Button>
|
||||
</div>
|
||||
{:else}
|
||||
@@ -244,7 +247,7 @@
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
Удалить правило
|
||||
{t("policy.rule.remove")}
|
||||
</button>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import { Dialog } from "bits-ui";
|
||||
import PolicyCard from "#lib/components/policy/PolicyCard.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
|
||||
const target = $derived(policyUi.target);
|
||||
@@ -22,10 +23,10 @@
|
||||
<div class="heading">
|
||||
<Dialog.Title class="dialog-title">{policyUi.title}</Dialog.Title>
|
||||
<span class="kind">
|
||||
{isChat ? "Политика захвата чата" : "Политика захвата папки"}
|
||||
{isChat ? t("policy.kind.chat") : t("policy.kind.folder")}
|
||||
</span>
|
||||
</div>
|
||||
<Dialog.Close aria-label="Закрыть" class="dialog-close">
|
||||
<Dialog.Close aria-label={t("common.close")} class="dialog-close">
|
||||
<Icon name="close" size="1.25rem" />
|
||||
</Dialog.Close>
|
||||
</header>
|
||||
|
||||
@@ -14,11 +14,13 @@
|
||||
import {
|
||||
type Chip,
|
||||
contentChips,
|
||||
DEFAULT_LABELS,
|
||||
defaultLabel,
|
||||
diffChips,
|
||||
sameToggles,
|
||||
summary,
|
||||
} from "#lib/format/policy.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { createChatPicker } from "#lib/stores/chat-picker.svelte.js";
|
||||
import { chats } from "#lib/stores/chats.svelte.js";
|
||||
|
||||
@@ -43,7 +45,7 @@
|
||||
let folders = $state<Folder[]>([]);
|
||||
let loading = $state(true);
|
||||
let failed = $state(false);
|
||||
let problem = $state<string | null>(null);
|
||||
let problem = $state<MessageKey | null>(null);
|
||||
let expanded = $state<string | null>(null);
|
||||
let draft = $state<Draft | null>(null);
|
||||
let picking = $state<"folder" | "chat" | null>(null);
|
||||
@@ -64,7 +66,7 @@
|
||||
const chatRules = $derived(
|
||||
rules
|
||||
.filter((rule) => rule.scope_type === "chat")
|
||||
.toSorted((a, b) => title(a).localeCompare(title(b), "ru"))
|
||||
.toSorted((a, b) => title(a).localeCompare(title(b), locale.tag))
|
||||
);
|
||||
const freeFolders = $derived(
|
||||
folders.filter(
|
||||
@@ -88,12 +90,12 @@
|
||||
|
||||
function title(rule: PolicyRule): string {
|
||||
if (rule.scope_type === "chat") {
|
||||
return rule.title ?? `Чат ${rule.scope_id}`;
|
||||
return rule.title ?? t("ui.chat", { id: rule.scope_id ?? "" });
|
||||
}
|
||||
if (rule.scope_type === "folder") {
|
||||
return rule.title ?? `Папка ${rule.scope_id}`;
|
||||
return rule.title ?? t("policy.folder", { id: rule.scope_id ?? "" });
|
||||
}
|
||||
return DEFAULT_LABELS[rule.scope_type] ?? "";
|
||||
return defaultLabel(rule.scope_type);
|
||||
}
|
||||
|
||||
function redundant(rule: PolicyRule): boolean {
|
||||
@@ -164,7 +166,7 @@
|
||||
await deletePolicy(rule.id);
|
||||
await reload();
|
||||
} catch {
|
||||
problem = "Не удалось убрать правило";
|
||||
problem = "policy.rule.dropFailed";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -227,7 +229,7 @@
|
||||
{#if plain}
|
||||
<span class="sub">{summary(rule)}</span>
|
||||
{:else if extra}
|
||||
<span class="sub">Ничего не меняет</span>
|
||||
<span class="sub">{t("policy.rule.redundant")}</span>
|
||||
{:else}
|
||||
<span class="chips">
|
||||
{#each chips(rule) as chip (chip.sign + chip.label)}
|
||||
@@ -242,7 +244,7 @@
|
||||
</button>
|
||||
{#if extra}
|
||||
<Button onclick={() => drop(rule)} smaller variant="text">
|
||||
Убрать
|
||||
{t("policy.rule.drop")}
|
||||
</Button>
|
||||
{/if}
|
||||
<button
|
||||
@@ -291,7 +293,7 @@
|
||||
{/if}
|
||||
<span class="text">
|
||||
<span class="name">{item.title}</span>
|
||||
<span class="sub">Новое правило</span>
|
||||
<span class="sub">{t("policy.rule.new")}</span>
|
||||
</span>
|
||||
</div>
|
||||
<Button
|
||||
@@ -301,7 +303,7 @@
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
Отмена
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
</div>
|
||||
<div class="editor" {@attach reveal}>
|
||||
@@ -318,17 +320,17 @@
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if failed}
|
||||
<div class="state">
|
||||
<p>Не удалось загрузить политику.</p>
|
||||
<Button onclick={reload} smaller variant="text">Повторить</Button>
|
||||
<p>{t("policy.loadFailed")}</p>
|
||||
<Button onclick={reload} smaller variant="text">{t("ui.retry")}</Button>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="policy">
|
||||
{#if problem}
|
||||
<p class="problem">{problem}</p>
|
||||
<p class="problem">{t(problem)}</p>
|
||||
{/if}
|
||||
|
||||
<section>
|
||||
<div class="section-title"><h3>По умолчанию</h3></div>
|
||||
<div class="section-title"><h3>{t("policy.section.defaults")}</h3></div>
|
||||
{#each defaults as rule (rule.id)}
|
||||
{@render row(rule, true)}
|
||||
{/each}
|
||||
@@ -336,8 +338,8 @@
|
||||
|
||||
<section>
|
||||
<div class="section-title">
|
||||
<h3>Папки</h3>
|
||||
<span>Что сохраняют. Из подходящих папок побеждает первая.</span>
|
||||
<h3>{t("policy.section.folders")}</h3>
|
||||
<span>{t("policy.section.foldersHint")}</span>
|
||||
</div>
|
||||
{#each folderRules as rule (rule.id)}
|
||||
{#if draft && draftBefore(rule)}
|
||||
@@ -356,7 +358,7 @@
|
||||
type="button"
|
||||
>
|
||||
<Icon name="add" size="1.25rem" />
|
||||
<span>Правило для папки</span>
|
||||
<span>{t("policy.add.folder")}</span>
|
||||
</button>
|
||||
{#if picking === "folder"}
|
||||
<div class="picker">
|
||||
@@ -376,8 +378,8 @@
|
||||
|
||||
<section>
|
||||
<div class="section-title">
|
||||
<h3>Чаты</h3>
|
||||
<span>Что меняют против папки или умолчания. Важнее папок.</span>
|
||||
<h3>{t("policy.section.chats")}</h3>
|
||||
<span>{t("policy.section.chatsHint")}</span>
|
||||
</div>
|
||||
{#if draft?.scopeType === "chat"}
|
||||
{@render pending(draft)}
|
||||
@@ -392,33 +394,29 @@
|
||||
type="button"
|
||||
>
|
||||
<Icon name="add" size="1.25rem" />
|
||||
<span>Правило для чата</span>
|
||||
<span>{t("policy.add.chat")}</span>
|
||||
</button>
|
||||
{#if picking === "chat"}
|
||||
<div class="picker">
|
||||
<input
|
||||
aria-label="Поиск чата"
|
||||
aria-label={t("ui.searchChat")}
|
||||
class="filter"
|
||||
oninput={() => picker.search(chatFilter)}
|
||||
placeholder="Поиск чата"
|
||||
placeholder={t("ui.searchChat")}
|
||||
type="text"
|
||||
bind:value={chatFilter}
|
||||
>
|
||||
{#each freeChats as chat (chat.chat_id)}
|
||||
{@const name = chat.title ?? t("ui.chat", { id: chat.chat_id })}
|
||||
<button
|
||||
class="pick"
|
||||
onclick={() =>
|
||||
start(
|
||||
"chat",
|
||||
chat.chat_id,
|
||||
chat.title ?? `Чат ${chat.chat_id}`
|
||||
)}
|
||||
onclick={() => start("chat", chat.chat_id, name)}
|
||||
type="button"
|
||||
>
|
||||
{chat.title ?? `Чат ${chat.chat_id}`}
|
||||
{name}
|
||||
</button>
|
||||
{:else}
|
||||
<p class="nothing">Ничего не найдено.</p>
|
||||
<p class="nothing">{t("ui.nothingFound")}</p>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
@@ -24,35 +24,11 @@
|
||||
formatSpan,
|
||||
isOnline,
|
||||
} from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { presence } from "#lib/stores/presence.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const TEXT = {
|
||||
average: "В среднем за день",
|
||||
byDay: "По дням",
|
||||
byHour: "По часам недели",
|
||||
failed: "Не удалось загрузить аналитику.",
|
||||
firstOnline: "Обычно появляется",
|
||||
hidden:
|
||||
"Скрывает, когда был(а) в сети. Telegram показывает только «был(а) недавно», поэтому время в сети не посчитать.",
|
||||
lastOffline: "Обычно уходит",
|
||||
median: "Обычная сессия",
|
||||
messages: "Сообщения",
|
||||
mine: "Я отвечаю",
|
||||
missing: "Нет данных",
|
||||
noData: "нет данных",
|
||||
noMessages: "За этот период сообщений нет.",
|
||||
noStatus: "Статусов пока нет.",
|
||||
openChat: "Откройте чат",
|
||||
period: (count: number) => `${count} дней`,
|
||||
retry: "Повторить",
|
||||
sessions: "Сессии",
|
||||
theirs: "Мне отвечают",
|
||||
title: "Аналитика",
|
||||
total: (count: number) => `в сети за ${count} дней`,
|
||||
};
|
||||
|
||||
const PERIODS = [7, 30, 90];
|
||||
const DEFAULT_PERIOD = 30;
|
||||
const SESSION_PAGE = 30;
|
||||
@@ -60,7 +36,7 @@
|
||||
const MS_IN_SECOND = 1000;
|
||||
|
||||
const tz = browserTimeZone();
|
||||
const zone = timeZoneLabel();
|
||||
const zone = $derived(timeZoneLabel());
|
||||
|
||||
const chatId = $derived(
|
||||
page.params.chatId ? Number(page.params.chatId) : null
|
||||
@@ -97,25 +73,25 @@
|
||||
const result: { label: string; value: string }[] = [];
|
||||
if (summary.daily_seconds !== null) {
|
||||
result.push({
|
||||
label: TEXT.average,
|
||||
label: t("presence.average"),
|
||||
value: formatSpan(summary.daily_seconds),
|
||||
});
|
||||
}
|
||||
if (summary.median_session_seconds !== null) {
|
||||
result.push({
|
||||
label: TEXT.median,
|
||||
label: t("presence.median"),
|
||||
value: formatSpan(summary.median_session_seconds),
|
||||
});
|
||||
}
|
||||
if (summary.first_online !== null) {
|
||||
result.push({
|
||||
label: TEXT.firstOnline,
|
||||
label: t("presence.firstOnline"),
|
||||
value: formatClock(summary.first_online),
|
||||
});
|
||||
}
|
||||
if (summary.last_offline !== null) {
|
||||
result.push({
|
||||
label: TEXT.lastOffline,
|
||||
label: t("presence.lastOffline"),
|
||||
value: formatClock(summary.last_offline),
|
||||
});
|
||||
}
|
||||
@@ -124,13 +100,16 @@
|
||||
MS_IN_SECOND;
|
||||
const missing = period - summary.covered_seconds;
|
||||
if (missing >= SECONDS_IN_HOUR) {
|
||||
result.push({ label: TEXT.missing, value: formatLongSpan(missing) });
|
||||
result.push({
|
||||
label: t("presence.missing"),
|
||||
value: formatLongSpan(missing),
|
||||
});
|
||||
}
|
||||
return result;
|
||||
});
|
||||
|
||||
function reply(seconds: number | null): string {
|
||||
return seconds === null ? TEXT.noData : formatSpan(seconds);
|
||||
return seconds === null ? t("presence.noData") : formatSpan(seconds);
|
||||
}
|
||||
|
||||
async function load(id: number, period: number) {
|
||||
@@ -172,7 +151,7 @@
|
||||
</script>
|
||||
|
||||
{#if chatId === null}
|
||||
<EmptyState description={TEXT.openChat} title={TEXT.title} />
|
||||
<EmptyState description={t("profile.empty")} title={t("profile.analytics")} />
|
||||
{:else}
|
||||
<div class="analytics">
|
||||
<div class="periods">
|
||||
@@ -185,20 +164,20 @@
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
{TEXT.period(period)}
|
||||
{t("presence.days", { count: period })}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
{#if failed}
|
||||
<div class="state">
|
||||
<p>{TEXT.failed}</p>
|
||||
<p>{t("presence.failed")}</p>
|
||||
<Button
|
||||
onclick={() => chatId !== null && load(chatId, days)}
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
{TEXT.retry}
|
||||
{t("ui.retry")}
|
||||
</Button>
|
||||
</div>
|
||||
{:else if volume === null || (isDm && stats === null)}
|
||||
@@ -211,7 +190,9 @@
|
||||
<span class="total"
|
||||
>{formatSpan(stats.summary.online_seconds)}</span
|
||||
>
|
||||
<span class="count">{TEXT.total(shownDays)}</span>
|
||||
<span class="count"
|
||||
>{t("presence.total", { count: shownDays })}</span
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
{#if sample}
|
||||
@@ -220,9 +201,9 @@
|
||||
</p>
|
||||
{/if}
|
||||
{#if stats.hidden}
|
||||
<p class="note">{TEXT.hidden}</p>
|
||||
<p class="note">{t("presence.hidden")}</p>
|
||||
{:else if !tracked}
|
||||
<p class="note">{TEXT.noStatus}</p>
|
||||
<p class="note">{t("presence.noStatus")}</p>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
@@ -242,34 +223,34 @@
|
||||
|
||||
<section>
|
||||
<div class="section-title">
|
||||
<h3>{TEXT.byHour}</h3>
|
||||
<h3>{t("presence.byHour")}</h3>
|
||||
<span>{zone}</span>
|
||||
</div>
|
||||
<PresenceHeatmap week={stats.week} />
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<div class="section-title"><h3>{TEXT.byDay}</h3></div>
|
||||
<div class="section-title"><h3>{t("presence.byDay")}</h3></div>
|
||||
<OnlineDays days={stats.days} />
|
||||
</section>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
<section>
|
||||
<div class="section-title"><h3>{TEXT.messages}</h3></div>
|
||||
<div class="section-title"><h3>{t("presence.messages")}</h3></div>
|
||||
{#if quiet}
|
||||
<p class="state">{TEXT.noMessages}</p>
|
||||
<p class="state">{t("presence.noMessages")}</p>
|
||||
{:else}
|
||||
<VolumeChart {volume} />
|
||||
{/if}
|
||||
{#if response && response.mine_count + response.their_count > 0}
|
||||
<dl class="rows replies">
|
||||
<div class="row">
|
||||
<dt>{TEXT.mine}</dt>
|
||||
<dt>{t("presence.mine")}</dt>
|
||||
<dd>{reply(response.mine_median_seconds)}</dd>
|
||||
</div>
|
||||
<div class="row">
|
||||
<dt>{TEXT.theirs}</dt>
|
||||
<dt>{t("presence.theirs")}</dt>
|
||||
<dd>{reply(response.their_median_seconds)}</dd>
|
||||
</div>
|
||||
</dl>
|
||||
@@ -278,7 +259,7 @@
|
||||
|
||||
{#if isDm && stats && tracked && !stats.hidden}
|
||||
<section>
|
||||
<div class="section-title"><h3>{TEXT.sessions}</h3></div>
|
||||
<div class="section-title"><h3>{t("presence.sessions")}</h3></div>
|
||||
{#key `${chatId}:${shownDays}:${stats.until}`}
|
||||
<PresenceSessions
|
||||
days={shownDays}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import type { PresenceDay } from "#lib/api/types.js";
|
||||
import { formatDay, parseDay } from "#lib/format/datetime.js";
|
||||
import { formatSpan } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
days: PresenceDay[];
|
||||
@@ -12,18 +13,6 @@
|
||||
const SECONDS_IN_HOUR = 3600;
|
||||
const SECONDS_IN_DAY = 86_400;
|
||||
|
||||
const TEXT = {
|
||||
bar: (day: string, online: number, missing: number) => {
|
||||
if (missing >= SECONDS_IN_DAY - SECONDS_IN_HOUR) {
|
||||
return `${day}, нет данных`;
|
||||
}
|
||||
const gap =
|
||||
missing >= SECONDS_IN_HOUR ? `, нет данных ${formatSpan(missing)}` : "";
|
||||
return `${day}, ${formatSpan(online)} в сети${gap}`;
|
||||
},
|
||||
today: "сегодня",
|
||||
};
|
||||
|
||||
const peak = $derived(Math.max(1, ...days.map((day) => day.online_seconds)));
|
||||
const first = $derived(days[0]);
|
||||
|
||||
@@ -31,6 +20,23 @@
|
||||
return formatDay(parseDay(day).toISOString());
|
||||
}
|
||||
|
||||
function title(day: PresenceDay, index: number): string {
|
||||
const date = label(day.day);
|
||||
const missing = absent(day, index);
|
||||
if (missing >= SECONDS_IN_DAY - SECONDS_IN_HOUR) {
|
||||
return t("presence.dayNoData", { day: date });
|
||||
}
|
||||
const span = formatSpan(day.online_seconds);
|
||||
if (missing >= SECONDS_IN_HOUR) {
|
||||
return t("presence.dayGap", {
|
||||
day: date,
|
||||
gap: formatSpan(missing),
|
||||
span,
|
||||
});
|
||||
}
|
||||
return t("presence.day", { day: date, span });
|
||||
}
|
||||
|
||||
function absent(day: PresenceDay, index: number): number {
|
||||
if (index === days.length - 1) {
|
||||
return 0;
|
||||
@@ -46,11 +52,7 @@
|
||||
{#each days as day, index (day.day)}
|
||||
<div
|
||||
class={["slot", { empty: day.covered_seconds < SECONDS_IN_HOUR }]}
|
||||
title={TEXT.bar(
|
||||
label(day.day),
|
||||
day.online_seconds,
|
||||
absent(day, index)
|
||||
)}
|
||||
title={title(day, index)}
|
||||
>
|
||||
<span
|
||||
class={["bar", { zero: day.online_seconds === 0 }]}
|
||||
@@ -63,7 +65,7 @@
|
||||
{#if first}
|
||||
<div class="axis">
|
||||
<span>{label(first.day)}</span>
|
||||
<span>{TEXT.today}</span>
|
||||
<span>{t("presence.axisToday")}</span>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { PresenceHour } from "#lib/api/types.js";
|
||||
import { formatSpan } from "#lib/format/presence.js";
|
||||
import { formatSpan, weekdayLabels } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
week: PresenceHour[];
|
||||
@@ -8,28 +9,14 @@
|
||||
|
||||
const { week }: Props = $props();
|
||||
|
||||
const TEXT = {
|
||||
cell: (day: string, cell: PresenceHour) => {
|
||||
const slot = `${day}, ${cell.hour}:00`;
|
||||
if (cell.hours === 0) {
|
||||
return slot;
|
||||
}
|
||||
if (cell.online_minutes === null) {
|
||||
return `${slot}, нет данных`;
|
||||
}
|
||||
return `${slot}, в среднем ${formatSpan(cell.online_minutes * 60)} в сети`;
|
||||
},
|
||||
days: ["Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"],
|
||||
empty: "нет данных",
|
||||
max: (minutes: number) => `до ${formatSpan(minutes * 60)}`,
|
||||
};
|
||||
|
||||
const HOURS_IN_DAY = 24;
|
||||
const SECONDS_IN_MINUTE = 60;
|
||||
const HOUR_TICKS = [0, 6, 12, 18];
|
||||
const MIN_SHADE = 0.18;
|
||||
|
||||
const weekdays = $derived(weekdayLabels());
|
||||
const rows = $derived(
|
||||
TEXT.days.map((_, weekday) =>
|
||||
weekdays.map((_, weekday) =>
|
||||
week
|
||||
.filter((cell) => cell.weekday === weekday)
|
||||
.sort((a, b) => a.hour - b.hour)
|
||||
@@ -44,6 +31,20 @@
|
||||
return cell.hours > 0 && cell.online_minutes === null;
|
||||
}
|
||||
|
||||
function title(day: string, cell: PresenceHour): string {
|
||||
const slot = `${day}, ${cell.hour}:00`;
|
||||
if (cell.hours === 0) {
|
||||
return slot;
|
||||
}
|
||||
if (cell.online_minutes === null) {
|
||||
return t("presence.cellNoData", { slot });
|
||||
}
|
||||
return t("presence.cellAverage", {
|
||||
slot,
|
||||
span: formatSpan(cell.online_minutes * SECONDS_IN_MINUTE),
|
||||
});
|
||||
}
|
||||
|
||||
function shade(minutes: number | null): number {
|
||||
if (minutes === null || minutes === 0 || peak === 0) {
|
||||
return 0;
|
||||
@@ -55,7 +56,7 @@
|
||||
<div class="heatmap">
|
||||
{#each rows as cells, weekday (weekday)}
|
||||
<div class="row">
|
||||
<span class="day">{TEXT.days[weekday]}</span>
|
||||
<span class="day">{weekdays[weekday]}</span>
|
||||
<div class="cells">
|
||||
{#each cells as cell (cell.hour)}
|
||||
<span
|
||||
@@ -67,7 +68,7 @@
|
||||
zero: cell.online_minutes === 0,
|
||||
},
|
||||
]}
|
||||
title={TEXT.cell(TEXT.days[weekday] ?? "", cell)}
|
||||
title={title(weekdays[weekday] ?? "", cell)}
|
||||
style:--shade="{shade(cell.online_minutes) * 100}%"
|
||||
></span>
|
||||
{/each}
|
||||
@@ -87,13 +88,13 @@
|
||||
{#if peak > 0}
|
||||
<span class="key">
|
||||
<span class="scale"></span>
|
||||
{TEXT.max(peak)}
|
||||
{t("presence.max", { span: formatSpan(peak * SECONDS_IN_MINUTE) })}
|
||||
</span>
|
||||
{/if}
|
||||
{#if hasGaps}
|
||||
<span class="key">
|
||||
<span class="swatch empty"></span>
|
||||
{TEXT.empty}
|
||||
{t("presence.noData")}
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -115,7 +116,7 @@
|
||||
|
||||
.day {
|
||||
flex-shrink: 0;
|
||||
width: 1.375rem;
|
||||
width: 1.75rem;
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
@@ -173,7 +174,7 @@
|
||||
gap: 0.25rem 0.75rem;
|
||||
align-items: center;
|
||||
|
||||
margin: 0.375rem 0 0 1.875rem;
|
||||
margin: 0.375rem 0 0 2.25rem;
|
||||
|
||||
font-size: 0.75rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatLongDay, formatTime } from "#lib/format/datetime.js";
|
||||
import { formatSpan } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
days: number;
|
||||
@@ -16,18 +17,6 @@
|
||||
|
||||
const { days, first, pageSize, peerId, tz }: Props = $props();
|
||||
|
||||
const TEXT = {
|
||||
failed: "Не удалось загрузить сессии.",
|
||||
more: "Показать ещё",
|
||||
none: "За этот период в сети не был(а).",
|
||||
now: "в сети",
|
||||
retry: "Повторить",
|
||||
since: (time: string) => `с ${time}`,
|
||||
span: (from: string, to: string) => (from === to ? from : `${from}–${to}`),
|
||||
today: "Сегодня",
|
||||
yesterday: "Вчера",
|
||||
};
|
||||
|
||||
const MS_IN_DAY = 86_400_000;
|
||||
|
||||
let extra = $state<PresenceSession[]>([]);
|
||||
@@ -54,18 +43,22 @@
|
||||
function dayLabel(date: Date): string {
|
||||
const today = new Date();
|
||||
if (date.toDateString() === today.toDateString()) {
|
||||
return TEXT.today;
|
||||
return t("presence.today");
|
||||
}
|
||||
if (
|
||||
date.toDateString() ===
|
||||
new Date(today.getTime() - MS_IN_DAY).toDateString()
|
||||
) {
|
||||
return TEXT.yesterday;
|
||||
return t("presence.yesterday");
|
||||
}
|
||||
const text = formatLongDay(date);
|
||||
return text.charAt(0).toUpperCase() + text.slice(1);
|
||||
}
|
||||
|
||||
function span(from: string, to: string): string {
|
||||
return from === to ? from : `${from}–${to}`;
|
||||
}
|
||||
|
||||
async function loadMore() {
|
||||
if (loading) {
|
||||
return;
|
||||
@@ -92,7 +85,7 @@
|
||||
</script>
|
||||
|
||||
{#if sessions.length === 0}
|
||||
<p class="state">{TEXT.none}</p>
|
||||
<p class="state">{t("presence.noSessions")}</p>
|
||||
{:else}
|
||||
{#each groups as group (group.label)}
|
||||
<h4 class="day">{group.label}</h4>
|
||||
@@ -101,14 +94,13 @@
|
||||
<li>
|
||||
<span>
|
||||
{session.ongoing
|
||||
? TEXT.since(formatTime(session.started))
|
||||
: TEXT.span(
|
||||
formatTime(session.started),
|
||||
formatTime(session.ended)
|
||||
)}
|
||||
? t("presence.since", { time: formatTime(session.started) })
|
||||
: span(formatTime(session.started), formatTime(session.ended))}
|
||||
</span>
|
||||
<span class={["length", { online: session.ongoing }]}>
|
||||
{session.ongoing ? TEXT.now : formatSpan(session.seconds)}
|
||||
{session.ongoing
|
||||
? t("presence.online")
|
||||
: formatSpan(session.seconds)}
|
||||
</span>
|
||||
</li>
|
||||
{/each}
|
||||
@@ -118,11 +110,13 @@
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if failed}
|
||||
<div class="state">
|
||||
<p>{TEXT.failed}</p>
|
||||
<Button onclick={loadMore} smaller variant="text">{TEXT.retry}</Button>
|
||||
<p>{t("presence.sessionsFailed")}</p>
|
||||
<Button onclick={loadMore} smaller variant="text">{t("ui.retry")}</Button>
|
||||
</div>
|
||||
{:else if !exhausted}
|
||||
<button class="more" onclick={loadMore} type="button">{TEXT.more}</button>
|
||||
<button class="more" onclick={loadMore} type="button">
|
||||
{t("ui.showMore")}
|
||||
</button>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { VolumeBucket } from "#lib/api/types.js";
|
||||
import { formatDay, parseDay } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
volume: VolumeBucket[];
|
||||
@@ -8,22 +9,25 @@
|
||||
|
||||
const { volume }: Props = $props();
|
||||
|
||||
const TEXT = {
|
||||
bar: (day: string, bucket: VolumeBucket) =>
|
||||
bucket.total === 0
|
||||
? `${day}, нет сообщений`
|
||||
: `${day}, всего ${bucket.total}: входящих ${bucket.incoming}, моих ${bucket.outgoing}`,
|
||||
incoming: "входящие",
|
||||
outgoing: "мои",
|
||||
today: "сегодня",
|
||||
};
|
||||
|
||||
const peak = $derived(Math.max(1, ...volume.map((bucket) => bucket.total)));
|
||||
const first = $derived(volume[0]);
|
||||
|
||||
function label(day: string): string {
|
||||
return formatDay(parseDay(day).toISOString());
|
||||
}
|
||||
|
||||
function title(bucket: VolumeBucket): string {
|
||||
const day = label(bucket.bucket);
|
||||
if (bucket.total === 0) {
|
||||
return t("presence.volumeEmpty", { day });
|
||||
}
|
||||
return t("presence.volume", {
|
||||
day,
|
||||
incoming: bucket.incoming,
|
||||
outgoing: bucket.outgoing,
|
||||
total: bucket.total,
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="volume">
|
||||
@@ -31,7 +35,7 @@
|
||||
<span class="peak">{peak}</span>
|
||||
<div class={["bars", { dense: volume.length > 45 }]}>
|
||||
{#each volume as bucket (bucket.bucket)}
|
||||
<div class="slot" title={TEXT.bar(label(bucket.bucket), bucket)}>
|
||||
<div class="slot" title={title(bucket)}>
|
||||
<div
|
||||
class={["bar", { zero: bucket.total === 0 }]}
|
||||
style:height="{(bucket.total / peak) * 100}%"
|
||||
@@ -46,12 +50,16 @@
|
||||
{#if first}
|
||||
<div class="axis">
|
||||
<span>{label(first.bucket)}</span>
|
||||
<span>{TEXT.today}</span>
|
||||
<span>{t("presence.axisToday")}</span>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="legend">
|
||||
<span class="key"><span class="swatch in"></span>{TEXT.incoming}</span>
|
||||
<span class="key"><span class="swatch out"></span>{TEXT.outgoing}</span>
|
||||
<span class="key"
|
||||
><span class="swatch in"></span>{t("presence.volumeIncoming")}</span
|
||||
>
|
||||
<span class="key"
|
||||
><span class="swatch out"></span>{t("presence.volumeOutgoing")}</span
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,40 +1,42 @@
|
||||
<script lang="ts">
|
||||
import { untrack } from "svelte";
|
||||
import { getChatCalendar, getMessageAt } from "#lib/api/endpoints.js";
|
||||
import type { DayCount } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { goto } from "$app/navigation";
|
||||
|
||||
interface Props {
|
||||
chatId: number;
|
||||
}
|
||||
|
||||
let { chatId }: Props = $props();
|
||||
|
||||
const LEVELS = 4;
|
||||
const WEEKDAYS = ["Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"];
|
||||
const MONTHS = [
|
||||
"Январь",
|
||||
"Февраль",
|
||||
"Март",
|
||||
"Апрель",
|
||||
"Май",
|
||||
"Июнь",
|
||||
"Июль",
|
||||
"Август",
|
||||
"Сентябрь",
|
||||
"Октябрь",
|
||||
"Ноябрь",
|
||||
"Декабрь",
|
||||
];
|
||||
import { page } from "$app/state";
|
||||
|
||||
interface YearMonth {
|
||||
month: number;
|
||||
year: number;
|
||||
}
|
||||
|
||||
interface Props {
|
||||
chatId: number;
|
||||
initial?: YearMonth | null;
|
||||
onjump?: () => void;
|
||||
}
|
||||
|
||||
let { chatId, initial = null, onjump }: Props = $props();
|
||||
|
||||
const LEVELS = 4;
|
||||
const MONDAY = Date.UTC(2024, 0, 1);
|
||||
const DAY_MS = 86_400_000;
|
||||
|
||||
const weekdays = $derived.by(() => {
|
||||
const names = new Intl.DateTimeFormat(locale.tag, {
|
||||
timeZone: "UTC",
|
||||
weekday: "short",
|
||||
});
|
||||
return Array.from({ length: 7 }, (_, offset) =>
|
||||
names.format(new Date(MONDAY + offset * DAY_MS))
|
||||
);
|
||||
});
|
||||
|
||||
interface DayCell {
|
||||
count: number;
|
||||
day: number;
|
||||
@@ -44,7 +46,7 @@
|
||||
|
||||
let days = $state<DayCount[]>([]);
|
||||
let loading = $state(false);
|
||||
let cursor = $state<YearMonth | null>(null);
|
||||
let cursor = $state<YearMonth | null>(untrack(() => initial));
|
||||
const cache = new Map<string, DayCount[]>();
|
||||
|
||||
const now = new Date();
|
||||
@@ -61,6 +63,13 @@
|
||||
);
|
||||
|
||||
const view = $derived(cursor ?? currentMonth);
|
||||
const monthLabel = $derived.by(() => {
|
||||
const name = new Intl.DateTimeFormat(locale.tag, {
|
||||
month: "long",
|
||||
timeZone: "UTC",
|
||||
}).format(new Date(Date.UTC(view.year, view.month, 1)));
|
||||
return `${name.charAt(0).toUpperCase()}${name.slice(1)} ${view.year}`;
|
||||
});
|
||||
|
||||
function index(value: YearMonth): number {
|
||||
return value.year * 12 + value.month;
|
||||
@@ -115,9 +124,14 @@
|
||||
return result;
|
||||
});
|
||||
|
||||
let shown = untrack(() => `${chatId}:${accounts.selectedId}`);
|
||||
|
||||
$effect(() => {
|
||||
const _id = chatId;
|
||||
const _account = accounts.selectedId;
|
||||
const key = `${chatId}:${accounts.selectedId}`;
|
||||
if (key === shown) {
|
||||
return;
|
||||
}
|
||||
shown = key;
|
||||
cache.clear();
|
||||
cursor = null;
|
||||
days = [];
|
||||
@@ -161,7 +175,10 @@
|
||||
try {
|
||||
const target = await getMessageAt(chatId, cell.key);
|
||||
ui.requestJump(chatId, target.message_id);
|
||||
goto(`/app/${chatId}`);
|
||||
onjump?.();
|
||||
if (page.params.chatId !== String(chatId)) {
|
||||
goto(`/app/${chatId}`);
|
||||
}
|
||||
} catch {
|
||||
// no message resolved for that day
|
||||
}
|
||||
@@ -174,7 +191,7 @@
|
||||
<div class="calendar">
|
||||
<header class="nav">
|
||||
<button
|
||||
aria-label="Предыдущий год"
|
||||
aria-label={t("chat.calendar.prevYear")}
|
||||
class="step"
|
||||
onclick={() => shift(-12)}
|
||||
type="button"
|
||||
@@ -182,16 +199,16 @@
|
||||
«
|
||||
</button>
|
||||
<button
|
||||
aria-label="Предыдущий месяц"
|
||||
aria-label={t("chat.calendar.prevMonth")}
|
||||
class="step"
|
||||
onclick={() => shift(-1)}
|
||||
type="button"
|
||||
>
|
||||
<Icon name="arrow-left" />
|
||||
</button>
|
||||
<span class="label">{MONTHS[view.month]} {view.year}</span>
|
||||
<span class="label">{monthLabel}</span>
|
||||
<button
|
||||
aria-label="Следующий месяц"
|
||||
aria-label={t("chat.calendar.nextMonth")}
|
||||
class="step"
|
||||
disabled={!canNext}
|
||||
onclick={() => shift(1)}
|
||||
@@ -200,7 +217,7 @@
|
||||
<Icon name="arrow-right" />
|
||||
</button>
|
||||
<button
|
||||
aria-label="Следующий год"
|
||||
aria-label={t("chat.calendar.nextYear")}
|
||||
class="step"
|
||||
disabled={!canNext}
|
||||
onclick={() => shift(12)}
|
||||
@@ -211,7 +228,7 @@
|
||||
</header>
|
||||
|
||||
<div class="weekdays">
|
||||
{#each WEEKDAYS as weekday (weekday)}
|
||||
{#each weekdays as weekday (weekday)}
|
||||
<span>{weekday}</span>
|
||||
{/each}
|
||||
</div>
|
||||
@@ -225,7 +242,7 @@
|
||||
<button
|
||||
class="cell day lvl-{cell.level}"
|
||||
onclick={() => jump(cell)}
|
||||
title={`${cell.count} сообщений`}
|
||||
title={t("chat.calendar.count", { count: cell.count })}
|
||||
type="button"
|
||||
>
|
||||
{cell.day}
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
import ProfileSection from "#lib/components/profile/ProfileSection.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { formatDate, formatFull } from "#lib/format/datetime.js";
|
||||
import { formatPhone } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { peers } from "#lib/stores/peers.svelte.js";
|
||||
@@ -56,7 +57,7 @@
|
||||
result.push({
|
||||
icon: "phone",
|
||||
label: t("profile.phone"),
|
||||
value: `+${peer.phone}`,
|
||||
value: formatPhone(peer.phone),
|
||||
});
|
||||
}
|
||||
if (peer?.username) {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
import Avatar from "#lib/components/ui/Avatar.svelte";
|
||||
import EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { peerName } from "#lib/format/peer.js";
|
||||
import { formatPhone, peerName } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
@@ -73,7 +73,7 @@
|
||||
if (peer?.username) {
|
||||
return `@${peer.username}`;
|
||||
}
|
||||
return peer?.phone ? `+${peer.phone}` : `ID ${targetId}`;
|
||||
return peer?.phone ? formatPhone(peer.phone) : `ID ${targetId}`;
|
||||
}
|
||||
const count = chat?.message_count ?? 0;
|
||||
return count > 0 ? t("profile.messages", { count }) : t("profile.group");
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatListDate } from "#lib/format/datetime.js";
|
||||
import { safeHref } from "#lib/format/url.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
import { goto } from "$app/navigation";
|
||||
@@ -83,7 +84,7 @@
|
||||
{#if loading}
|
||||
<div class="center"><Spinner /></div>
|
||||
{:else}
|
||||
<EmptyState title="Нет ссылок" />
|
||||
<div class="center"><EmptyState title={t("social.links.empty")} /></div>
|
||||
{/if}
|
||||
{:else}
|
||||
<ul class="list">
|
||||
@@ -122,7 +123,7 @@
|
||||
onclick={() => loadMore()}
|
||||
type="button"
|
||||
>
|
||||
{loading ? "Загрузка…" : "Показать ещё"}
|
||||
{loading ? t("ui.loading") : t("ui.showMore")}
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatListDate } from "#lib/format/datetime.js";
|
||||
import { formatBytes, mediaKindLabel } from "#lib/format/media.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { poster } from "#lib/media/poster.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { shareUi } from "#lib/stores/shares.svelte.js";
|
||||
@@ -56,14 +57,16 @@
|
||||
);
|
||||
|
||||
function displayName(item: MediaView): string {
|
||||
return item.file_name ?? mediaKindLabel(item.kind) ?? "Файл";
|
||||
return (
|
||||
item.file_name ?? mediaKindLabel(item.kind) ?? t("media.kind.document")
|
||||
);
|
||||
}
|
||||
|
||||
async function save(item: MediaView) {
|
||||
try {
|
||||
await downloadMedia(item.id);
|
||||
} catch {
|
||||
toasts.error("Не удалось скачать файл");
|
||||
toasts.error(t("ui.downloadFailed"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,7 +178,7 @@
|
||||
{#if loading}
|
||||
<div class="center"><Spinner /></div>
|
||||
{:else}
|
||||
<EmptyState title="Пусто" />
|
||||
<div class="center"><EmptyState title={t("shared.media.empty")} /></div>
|
||||
{/if}
|
||||
{:else if layout === "grid"}
|
||||
<div class="grid">
|
||||
@@ -217,17 +220,17 @@
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="open-in-new-tab" onselect={() => open(index)}
|
||||
>Открыть на весь экран</ContextMenuItem
|
||||
>{t("shared.media.fullscreen")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="reply" onselect={() => jump(item.message_id)}
|
||||
>Перейти к сообщению</ContextMenuItem
|
||||
>{t("ui.jumpToMessage")}</ContextMenuItem
|
||||
>
|
||||
{#if item.downloaded}
|
||||
<ContextMenuItem icon="download" onselect={() => save(item)}
|
||||
>Скачать файл</ContextMenuItem
|
||||
>{t("ui.downloadFile")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="allow-share" onselect={() => share(item)}
|
||||
>Доступ по ссылке</ContextMenuItem
|
||||
>{t("ui.shareLink")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{/snippet}
|
||||
@@ -262,17 +265,17 @@
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="open-in-new-tab" onselect={() => open(index)}
|
||||
>Открыть</ContextMenuItem
|
||||
>{t("ui.open")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="reply" onselect={() => jump(item.message_id)}
|
||||
>Перейти к сообщению</ContextMenuItem
|
||||
>{t("ui.jumpToMessage")}</ContextMenuItem
|
||||
>
|
||||
{#if item.downloaded}
|
||||
<ContextMenuItem icon="download" onselect={() => save(item)}
|
||||
>Скачать файл</ContextMenuItem
|
||||
>{t("ui.downloadFile")}</ContextMenuItem
|
||||
>
|
||||
<ContextMenuItem icon="allow-share" onselect={() => share(item)}
|
||||
>Доступ по ссылке</ContextMenuItem
|
||||
>{t("ui.shareLink")}</ContextMenuItem
|
||||
>
|
||||
{/if}
|
||||
{/snippet}
|
||||
@@ -289,7 +292,7 @@
|
||||
onclick={() => loadMore()}
|
||||
type="button"
|
||||
>
|
||||
{loading ? "Загрузка…" : "Показать ещё"}
|
||||
{loading ? t("ui.loading") : t("ui.showMore")}
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
|
||||
Loaded 100 of 175 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user