Compare commits
28
Commits
90b37ec708
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2180e80ad | ||
|
|
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 |
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.
|
||||
@@ -24,7 +24,7 @@ Nothing is ever deleted from the archive.
|
||||
|
||||
## 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_feed`, `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,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,6 +21,7 @@ from api.routers import (
|
||||
avatars,
|
||||
backfill,
|
||||
bots,
|
||||
capture,
|
||||
chats,
|
||||
custom_emoji,
|
||||
discover,
|
||||
@@ -114,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)
|
||||
|
||||
|
||||
@@ -298,10 +298,11 @@ async def get_feed(
|
||||
"""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.
|
||||
`since` keeps items at or after that time; `chat_id` or `chat_kind` (dm
|
||||
with people, bot, 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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
@@ -29,6 +29,7 @@ async def list_feed(
|
||||
kind: Annotated[FeedKind, Query()] = FeedKind.ALL,
|
||||
chat_id: Annotated[int | None, Query()] = None,
|
||||
chat_kind: Annotated[FeedChatKind | None, Query()] = None,
|
||||
folder_id: Annotated[int | None, Query()] = None,
|
||||
since: Annotated[datetime | None, Query()] = None,
|
||||
cursor: Cursor = None,
|
||||
limit: Limit = DEFAULT_LIMIT,
|
||||
@@ -36,7 +37,13 @@ async def list_feed(
|
||||
return await feed.list_feed(
|
||||
pool,
|
||||
account_id,
|
||||
FeedFilter(kind=kind, chat_id=chat_id, chat_kind=chat_kind, since=since),
|
||||
FeedFilter(
|
||||
kind=kind,
|
||||
chat_id=chat_id,
|
||||
chat_kind=chat_kind,
|
||||
folder_id=folder_id,
|
||||
since=since,
|
||||
),
|
||||
limit=limit,
|
||||
cursor=cursor,
|
||||
)
|
||||
|
||||
@@ -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],
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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,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]
|
||||
@@ -80,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,
|
||||
@@ -149,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"],
|
||||
)
|
||||
|
||||
|
||||
@@ -259,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
|
||||
|
||||
|
||||
@@ -278,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
|
||||
|
||||
|
||||
@@ -301,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],
|
||||
|
||||
@@ -5,6 +5,7 @@ from enum import StrEnum
|
||||
|
||||
import asyncpg
|
||||
|
||||
from utils.policy import repository as policy_repository
|
||||
from utils.read import chats, peers
|
||||
from utils.read.accounts import self_user_id
|
||||
from utils.read.models import (
|
||||
@@ -45,6 +46,13 @@ LEFT JOIN LATERAL (
|
||||
) p ON true
|
||||
"""
|
||||
|
||||
_IS_BOT = """EXISTS (
|
||||
SELECT 1 FROM peers p
|
||||
WHERE p.account_id = feed_items.account_id AND p.peer_id = feed_items.chat_id
|
||||
AND COALESCE((p.raw->>'is_bot')::bool, (p.raw->>'bot')::bool,
|
||||
p.raw->>'type' = 'ChatType.BOT', false)
|
||||
)"""
|
||||
|
||||
_UNSEEN = """
|
||||
SELECT count(*) FILTER (WHERE kind = 'deleted') AS deleted,
|
||||
count(*) FILTER (WHERE kind = 'edited') AS edited
|
||||
@@ -69,15 +77,25 @@ class FeedKind(StrEnum):
|
||||
|
||||
class FeedChatKind(StrEnum):
|
||||
DM = "dm"
|
||||
BOT = "bot"
|
||||
GROUP = "group"
|
||||
CHANNEL = "channel"
|
||||
|
||||
|
||||
_CHAT_KIND_CLAUSES = {
|
||||
FeedChatKind.DM: f"chat_kind = 'dm' AND NOT {_IS_BOT}",
|
||||
FeedChatKind.BOT: f"chat_kind = 'dm' AND {_IS_BOT}",
|
||||
FeedChatKind.GROUP: "chat_kind = 'group'",
|
||||
FeedChatKind.CHANNEL: "chat_kind = 'channel'",
|
||||
}
|
||||
|
||||
|
||||
@dataclass(slots=True)
|
||||
class FeedFilter:
|
||||
kind: FeedKind = FeedKind.ALL
|
||||
chat_id: int | None = None
|
||||
chat_kind: FeedChatKind | None = None
|
||||
folder_id: int | None = None
|
||||
since: datetime | None = None
|
||||
|
||||
|
||||
@@ -90,18 +108,34 @@ def decode_cursor(cursor: str) -> tuple[datetime, int]:
|
||||
return _EPOCH + int(micros) * _MICROSECOND, int(key)
|
||||
|
||||
|
||||
async def _folder_chat_ids(
|
||||
pool: asyncpg.Pool, account_id: int, folder_id: int | None
|
||||
) -> list[int] | None:
|
||||
if folder_id is None:
|
||||
return None
|
||||
folder = await policy_repository.get_folder(pool, account_id, folder_id)
|
||||
if folder is None:
|
||||
return []
|
||||
return await chats.folder_chat_ids(pool, account_id, folder)
|
||||
|
||||
|
||||
def _where(
|
||||
account_id: int, feed: FeedFilter, cursor: str | None
|
||||
account_id: int,
|
||||
feed: FeedFilter,
|
||||
folder_chat_ids: list[int] | None,
|
||||
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'")
|
||||
if feed.chat_kind is not None:
|
||||
clauses.append(_CHAT_KIND_CLAUSES[feed.chat_kind])
|
||||
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),
|
||||
("chat_id = ANY({}::bigint[])", folder_chat_ids),
|
||||
("at >= {}", feed.since),
|
||||
)
|
||||
for template, value in conditions:
|
||||
@@ -191,7 +225,9 @@ async def _build_items(
|
||||
chat=FeedChat(
|
||||
chat_id=row["chat_id"],
|
||||
title=chat.title if chat else None,
|
||||
kind=row["chat_kind"],
|
||||
kind=FeedChatKind.BOT
|
||||
if chat and chat.is_bot and row["chat_kind"] == FeedChatKind.DM
|
||||
else row["chat_kind"],
|
||||
has_avatar=chat.has_avatar if chat else False,
|
||||
),
|
||||
message_id=row["message_id"],
|
||||
@@ -218,7 +254,8 @@ async def list_feed(
|
||||
cursor: str | None = None,
|
||||
) -> FeedPage:
|
||||
size = max(1, min(limit, MAX_LIMIT))
|
||||
where, params = _where(account_id, feed, cursor)
|
||||
folder_chat_ids = await _folder_chat_ids(pool, account_id, feed.folder_id)
|
||||
where, params = _where(account_id, feed, folder_chat_ids, cursor)
|
||||
params.append(size + 1)
|
||||
rows = await pool.fetch(
|
||||
f"SELECT {_ITEM_COLS} FROM feed_items WHERE {where} " # noqa: S608
|
||||
|
||||
@@ -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):
|
||||
@@ -611,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
|
||||
@@ -10,7 +10,10 @@ _EPOCH = datetime(1970, 1, 1, tzinfo=UTC)
|
||||
_MICROSECOND = timedelta(microseconds=1)
|
||||
|
||||
ChatKind = Literal["private", "group", "channel"]
|
||||
HitSource = Literal["text", "stt", "version"]
|
||||
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:
|
||||
@@ -34,6 +37,7 @@ class SearchFilters(BaseModel):
|
||||
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
|
||||
|
||||
@@ -45,6 +49,13 @@ class SearchFilters(BaseModel):
|
||||
return value
|
||||
|
||||
|
||||
class Found(BaseModel):
|
||||
where: FoundWhere
|
||||
path: str
|
||||
value: str
|
||||
button: str | None = None
|
||||
|
||||
|
||||
class SearchHit(BaseModel):
|
||||
chat_id: int
|
||||
message_id: int
|
||||
@@ -56,12 +67,14 @@ class SearchHit(BaseModel):
|
||||
edited_at: datetime | None
|
||||
deleted_at: datetime | None
|
||||
source: HitSource
|
||||
extracted_text: str | None
|
||||
version_text: str | None
|
||||
version_at: datetime | None
|
||||
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,5 +1,12 @@
|
||||
import json
|
||||
import re
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from time import monotonic
|
||||
|
||||
import asyncpg
|
||||
|
||||
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,
|
||||
@@ -10,6 +17,12 @@ from utils.search.models import (
|
||||
encode_cursor,
|
||||
)
|
||||
|
||||
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
|
||||
@@ -76,6 +89,24 @@ _WITH_MEDIA = (
|
||||
|
||||
_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}}"
|
||||
)
|
||||
|
||||
|
||||
class _Binder:
|
||||
def __init__(self) -> None:
|
||||
@@ -130,9 +161,72 @@ def _branch(sql: str, limit: str, order: str = _KEY_ORDER, **parts: str) -> str:
|
||||
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)
|
||||
|
||||
|
||||
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 []
|
||||
|
||||
|
||||
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
|
||||
)
|
||||
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)
|
||||
|
||||
|
||||
async def _search(conn: asyncpg.Connection, filters: SearchFilters) -> SearchPage:
|
||||
query = (filters.query or "").strip()
|
||||
terms: list[str] = []
|
||||
@@ -144,9 +238,7 @@ async def _search(conn: asyncpg.Connection, filters: SearchFilters) -> SearchPag
|
||||
return SearchPage(hits=[], next_cursor=None, terms=terms)
|
||||
tsquery = parsed["tsquery"]
|
||||
|
||||
channels: list[int] = []
|
||||
if filters.kind in {"group", "channel"}:
|
||||
channels = await conn.fetchval(_CHANNELS, filters.account_id)
|
||||
channels = await _channels(conn, filters)
|
||||
bind = _Binder()
|
||||
where = " AND ".join(_conditions(filters, channels, bind))
|
||||
size = min(filters.limit, MAX_LIMIT)
|
||||
|
||||
@@ -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(",") },
|
||||
});
|
||||
}
|
||||
@@ -284,6 +284,7 @@ export interface FeedQuery {
|
||||
chat_id?: number;
|
||||
chat_kind?: FeedChatKind;
|
||||
cursor?: string;
|
||||
folder_id?: number;
|
||||
kind?: FeedKind;
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
@@ -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,24 @@ export type PolicyScopeType =
|
||||
| "default_channel"
|
||||
| "folder"
|
||||
| "chat";
|
||||
export type SearchSource = "text" | "stt" | "version";
|
||||
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 =
|
||||
@@ -45,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;
|
||||
@@ -196,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;
|
||||
@@ -225,7 +245,7 @@ export interface MessageVersion {
|
||||
}
|
||||
|
||||
export type FeedKind = "all" | "deleted" | "edited" | "profile";
|
||||
export type FeedChatKind = "dm" | "group" | "channel";
|
||||
export type FeedChatKind = "dm" | "bot" | "group" | "channel";
|
||||
|
||||
export interface FeedChat {
|
||||
chat_id: number;
|
||||
@@ -286,6 +306,7 @@ export interface SearchHit {
|
||||
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;
|
||||
@@ -299,6 +320,7 @@ export interface SearchHit {
|
||||
export interface SearchPage {
|
||||
hits: SearchHit[];
|
||||
next_cursor: string | null;
|
||||
scanned_to: string | null;
|
||||
terms: string[];
|
||||
}
|
||||
|
||||
@@ -309,6 +331,7 @@ export interface SearchQuery {
|
||||
date_to?: string;
|
||||
deleted?: boolean;
|
||||
edited?: boolean;
|
||||
everywhere?: boolean;
|
||||
has_media?: boolean;
|
||||
kind?: SearchChatKind;
|
||||
limit?: number;
|
||||
|
||||
@@ -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>
|
||||
@@ -29,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) {
|
||||
@@ -39,7 +42,10 @@
|
||||
backfilling = true;
|
||||
try {
|
||||
await enqueueBackfill(chatId, true);
|
||||
toasts.success(t("chat.backfill.started"));
|
||||
backfilled = true;
|
||||
setTimeout(() => {
|
||||
backfilled = false;
|
||||
}, DONE_DURATION);
|
||||
} catch {
|
||||
toasts.error(t("chat.backfill.failed"));
|
||||
} finally {
|
||||
@@ -48,6 +54,10 @@
|
||||
}
|
||||
|
||||
function back() {
|
||||
if (page.state.inApp) {
|
||||
history.back();
|
||||
return;
|
||||
}
|
||||
const target = new URL(page.url.href);
|
||||
target.pathname = "/app";
|
||||
goto(withoutMessage(target));
|
||||
@@ -175,6 +185,16 @@
|
||||
<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")}
|
||||
@@ -199,6 +219,7 @@
|
||||
</Button>
|
||||
<Button
|
||||
aria-label={t("feed.changes")}
|
||||
class="wide-only"
|
||||
onclick={() => ui.openPanel("changes")}
|
||||
round
|
||||
smaller
|
||||
@@ -216,14 +237,16 @@
|
||||
<Icon name="stats" />
|
||||
</Button>
|
||||
<Button
|
||||
aria-label={t("chat.backfill")}
|
||||
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>
|
||||
@@ -275,6 +298,12 @@
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
margin-left: auto;
|
||||
|
||||
@media (max-width: 600px) {
|
||||
:global(.wide-only) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
@@ -287,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);
|
||||
|
||||
@@ -76,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) {
|
||||
|
||||
@@ -4,9 +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";
|
||||
@@ -31,6 +33,14 @@
|
||||
? 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(
|
||||
@@ -74,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>
|
||||
@@ -90,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>
|
||||
@@ -147,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,
|
||||
@@ -163,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,8 +1,11 @@
|
||||
<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 { feed } from "#lib/stores/feed.svelte.js";
|
||||
import { folders } from "#lib/stores/folders.svelte.js";
|
||||
import { policyUi } from "#lib/stores/policy.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
interface Tab {
|
||||
id: number | null;
|
||||
@@ -10,7 +13,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,
|
||||
@@ -92,8 +95,14 @@
|
||||
</button>
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem
|
||||
icon="recent"
|
||||
onselect={() => feed.open(page.url, tab.id)}
|
||||
>
|
||||
{t("feed.folder")}
|
||||
</ContextMenuItem>
|
||||
<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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
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";
|
||||
|
||||
@@ -49,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");
|
||||
@@ -140,9 +142,10 @@
|
||||
if (messageId === null) {
|
||||
return;
|
||||
}
|
||||
const target = messageId;
|
||||
try {
|
||||
await fetchMedia(chatId, messageId);
|
||||
toasts.success(t("media.queued"));
|
||||
await fetchMedia(chatId, target);
|
||||
queued.show(target);
|
||||
} catch {
|
||||
toasts.error(t("media.queueFailed"));
|
||||
}
|
||||
@@ -312,7 +315,12 @@
|
||||
<div class="media-message">
|
||||
<p>{t("media.notDownloaded")}</p>
|
||||
<Button fluid onclick={queueFetch} variant="primary">
|
||||
{t("media.downloadToArchive")}
|
||||
{#if queued.current === messageId}
|
||||
<Icon name="check" />
|
||||
{t("chat.media.queued")}
|
||||
{:else}
|
||||
{t("media.downloadToArchive")}
|
||||
{/if}
|
||||
</Button>
|
||||
</div>
|
||||
{:else if result?.state === "missing"}
|
||||
|
||||
@@ -15,14 +15,16 @@
|
||||
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";
|
||||
@@ -30,7 +32,7 @@
|
||||
interface Props {
|
||||
animate: boolean;
|
||||
firstInGroup: boolean;
|
||||
highlighted: boolean;
|
||||
highlight: string[] | null;
|
||||
isGroupChat: boolean;
|
||||
lastInGroup: boolean;
|
||||
message: MessageView;
|
||||
@@ -46,7 +48,7 @@
|
||||
isGroupChat,
|
||||
firstInGroup,
|
||||
lastInGroup,
|
||||
highlighted,
|
||||
highlight,
|
||||
animate,
|
||||
onjump,
|
||||
onmedia,
|
||||
@@ -54,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(
|
||||
@@ -137,13 +147,8 @@
|
||||
onjump(message.reply.message_id);
|
||||
}
|
||||
}
|
||||
async function copyText() {
|
||||
await navigator.clipboard.writeText(message.text ?? "");
|
||||
toasts.success(t("thread.copiedText"));
|
||||
}
|
||||
async function copyId() {
|
||||
await navigator.clipboard.writeText(String(message.message_id));
|
||||
toasts.success(t("thread.copiedId"));
|
||||
function messageLink(): string {
|
||||
return `${location.origin}/app/${message.chat_id}?message=${message.message_id}`;
|
||||
}
|
||||
function openSenderProfile() {
|
||||
if (senderChat === message.chat_id) {
|
||||
@@ -166,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}
|
||||
@@ -212,12 +217,6 @@
|
||||
{#if message.reply}
|
||||
<ReplyHeader {onjump} reply={message.reply} />
|
||||
{/if}
|
||||
{#if deleted}
|
||||
<span class="deleted-tag">
|
||||
<Icon name="delete" size="0.875rem" />
|
||||
{t("thread.deleted")}
|
||||
</span>
|
||||
{/if}
|
||||
{#if message.poll}
|
||||
<Poll poll={message.poll} />
|
||||
{/if}
|
||||
@@ -236,13 +235,20 @@
|
||||
{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 ?? ""}
|
||||
/>
|
||||
@@ -266,9 +272,15 @@
|
||||
{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">
|
||||
@@ -319,14 +331,26 @@
|
||||
>{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}
|
||||
>{t("thread.copyText")}</ContextMenuItem
|
||||
>
|
||||
<CopyItem
|
||||
done={t("chat.menu.copied")}
|
||||
icon="copy"
|
||||
label={t("thread.copyText")}
|
||||
text={() => message.text ?? ""}
|
||||
/>
|
||||
{/if}
|
||||
<ContextMenuItem icon="hashtag" onselect={copyId}
|
||||
>{t("thread.copyId")}</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}
|
||||
>{t("thread.senderProfile")}</ContextMenuItem
|
||||
@@ -454,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,9 +13,10 @@
|
||||
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";
|
||||
@@ -34,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);
|
||||
@@ -45,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);
|
||||
@@ -52,7 +58,10 @@
|
||||
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);
|
||||
@@ -66,6 +75,8 @@
|
||||
dayKey: string;
|
||||
daySeparator: string | null;
|
||||
firstInGroup: boolean;
|
||||
gapsAfter: CaptureGap[];
|
||||
gapsBefore: CaptureGap[];
|
||||
lastInGroup: boolean;
|
||||
message: MessageView;
|
||||
own: boolean;
|
||||
@@ -75,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) {
|
||||
@@ -82,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,
|
||||
});
|
||||
@@ -185,7 +230,11 @@
|
||||
return messages.find((m) => holds(m, messageId))?.message_id ?? null;
|
||||
}
|
||||
|
||||
function jumpToMessage(messageId: number, smooth = true) {
|
||||
function jumpToMessage(
|
||||
messageId: number,
|
||||
smooth = true,
|
||||
marks: string[] = []
|
||||
) {
|
||||
const owner = ownerOf(messageId) ?? messageId;
|
||||
const target = container?.querySelector<HTMLElement>(
|
||||
`[data-message-id="${owner}"]`
|
||||
@@ -198,13 +247,13 @@
|
||||
behavior: smooth ? "smooth" : "auto",
|
||||
block: "center",
|
||||
});
|
||||
highlightId = owner;
|
||||
highlight = { id: owner, marks };
|
||||
if (highlightTimer) {
|
||||
clearTimeout(highlightTimer);
|
||||
}
|
||||
highlightTimer = setTimeout(() => {
|
||||
highlightId = null;
|
||||
}, 1600);
|
||||
highlight = null;
|
||||
}, HIGHLIGHT_MS);
|
||||
}
|
||||
|
||||
function scrollToBottom() {
|
||||
@@ -219,13 +268,14 @@
|
||||
}
|
||||
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() {
|
||||
@@ -238,7 +288,7 @@
|
||||
ui.clearJump();
|
||||
await loadAround(pending.messageId);
|
||||
await tick();
|
||||
jumpToMessage(pending.messageId, false);
|
||||
jumpToMessage(pending.messageId, false, pending.marks);
|
||||
return;
|
||||
}
|
||||
const page = await listMessages(chatId, {
|
||||
@@ -252,6 +302,7 @@
|
||||
await tick();
|
||||
scrollToBottom();
|
||||
updateStuck();
|
||||
setTimeout(updateStuck, SETTLE_DELAY);
|
||||
} catch {
|
||||
toasts.error(t("thread.loadFailed"));
|
||||
} finally {
|
||||
@@ -394,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;
|
||||
@@ -521,14 +579,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function goTo(messageId: number) {
|
||||
async function goTo(messageId: number, marks: string[] = []) {
|
||||
try {
|
||||
const loaded = ownerOf(messageId) !== null;
|
||||
if (!loaded) {
|
||||
await loadAround(messageId);
|
||||
}
|
||||
await tick();
|
||||
jumpToMessage(messageId, loaded);
|
||||
jumpToMessage(messageId, loaded, marks);
|
||||
} catch {
|
||||
toasts.error(t("thread.loadFailed"));
|
||||
}
|
||||
@@ -540,7 +598,7 @@
|
||||
return;
|
||||
}
|
||||
ui.clearJump();
|
||||
goTo(target.messageId);
|
||||
goTo(target.messageId, target.marks);
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
@@ -581,22 +639,38 @@
|
||||
<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={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}
|
||||
@@ -625,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}
|
||||
@@ -714,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);
|
||||
@@ -725,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,6 +1,7 @@
|
||||
<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";
|
||||
@@ -25,6 +26,7 @@
|
||||
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";
|
||||
@@ -37,6 +39,7 @@
|
||||
changes: "feed.changes",
|
||||
jobs: "settings.jobs",
|
||||
links: "panel.links",
|
||||
notes: "notes.title",
|
||||
policy: "settings.policy",
|
||||
presence: "chat.analytics",
|
||||
profile: "chat.profile",
|
||||
@@ -49,7 +52,6 @@
|
||||
"storage-trash": "panel.trash",
|
||||
stories: "settings.stories",
|
||||
"stories-all": "panel.allStories",
|
||||
versions: "panel.versions",
|
||||
watches: "settings.watches",
|
||||
webhooks: "watches.webhooks",
|
||||
};
|
||||
@@ -65,6 +67,9 @@
|
||||
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)
|
||||
@@ -139,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"}
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
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 {
|
||||
@@ -15,6 +16,7 @@
|
||||
let { chatId }: Props = $props();
|
||||
|
||||
let busy = $state(false);
|
||||
const started = createFlash<true>();
|
||||
|
||||
const item = $derived(discover.get(chatId));
|
||||
const tracked = $derived(item?.tracked ?? false);
|
||||
@@ -34,7 +36,7 @@
|
||||
busy = true;
|
||||
try {
|
||||
discover.set(await trackChat(chatId, true));
|
||||
toasts.success(t("track.started"));
|
||||
started.show(true);
|
||||
chats.refresh();
|
||||
} catch {
|
||||
toasts.error(t("track.failed"));
|
||||
@@ -50,7 +52,7 @@
|
||||
busy = true;
|
||||
try {
|
||||
await enqueueBackfill(chatId, true, true);
|
||||
toasts.success(t("jobs.backfillStarted"));
|
||||
started.show(true);
|
||||
} catch {
|
||||
toasts.error(t("jobs.backfillFailed"));
|
||||
} finally {
|
||||
@@ -67,8 +69,10 @@
|
||||
<div class="actions">
|
||||
{#if tracked}
|
||||
<Button loading={busy} onclick={backfill} pill variant="secondary">
|
||||
<Icon name="cloud-download" />
|
||||
<span>{t("track.loadHistory")}</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">
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
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[];
|
||||
@@ -32,7 +33,7 @@
|
||||
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
|
||||
@@ -75,12 +76,6 @@
|
||||
border-radius: 0.75rem;
|
||||
}
|
||||
|
||||
.text {
|
||||
margin: 0;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
.meta {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
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";
|
||||
@@ -41,6 +42,7 @@
|
||||
.then((rows) => {
|
||||
if (current === token) {
|
||||
items = rows;
|
||||
notes.mark(cid, mid, rows.length > 0);
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
@@ -59,6 +61,7 @@
|
||||
try {
|
||||
const created = await createAnnotation(chatId, messageId, text);
|
||||
items = [created, ...items];
|
||||
notes.mark(chatId, messageId, true);
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
@@ -72,6 +75,7 @@
|
||||
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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -1,16 +1,32 @@
|
||||
<script lang="ts">
|
||||
import type { FeedChatKind, FeedKind } from "#lib/api/types.js";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { FEED_CHAT_KINDS, FEED_KINDS } from "#lib/stores/feed.svelte.js";
|
||||
import { folders } from "#lib/stores/folders.svelte.js";
|
||||
|
||||
interface Props {
|
||||
chats?: FeedChatKind | null;
|
||||
folder?: number | null;
|
||||
kind: FeedKind;
|
||||
onchats?: (chats: FeedChatKind | null) => void;
|
||||
onfolder?: (folder: number | null) => void;
|
||||
onkind: (kind: FeedKind) => void;
|
||||
}
|
||||
|
||||
let { kind, chats = null, onkind, onchats }: Props = $props();
|
||||
let {
|
||||
kind,
|
||||
chats = null,
|
||||
folder = null,
|
||||
onkind,
|
||||
onchats,
|
||||
onfolder,
|
||||
}: Props = $props();
|
||||
|
||||
const folderTitle = $derived(
|
||||
folders.list.find((item) => item.folder_id === folder)?.title ??
|
||||
t("feed.folder")
|
||||
);
|
||||
|
||||
const KIND_KEYS = {
|
||||
all: "feed.filter.all",
|
||||
@@ -20,6 +36,7 @@
|
||||
} as const;
|
||||
|
||||
const CHAT_KEYS = {
|
||||
bot: "feed.chats.bot",
|
||||
channel: "feed.chats.channel",
|
||||
dm: "feed.chats.dm",
|
||||
group: "feed.chats.group",
|
||||
@@ -55,6 +72,20 @@
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
{#if folder !== null && onfolder}
|
||||
<div class="group">
|
||||
<button
|
||||
aria-pressed="true"
|
||||
class="chip on"
|
||||
onclick={() => onfolder(null)}
|
||||
type="button"
|
||||
>
|
||||
<Icon name="folder" size="0.875rem" />
|
||||
{folderTitle}
|
||||
<Icon name="close" size="0.875rem" />
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
@@ -78,6 +109,7 @@
|
||||
cursor: pointer;
|
||||
|
||||
display: inline-flex;
|
||||
gap: 0.25rem;
|
||||
align-items: center;
|
||||
|
||||
height: 1.75rem;
|
||||
|
||||
@@ -14,11 +14,12 @@
|
||||
interface Props {
|
||||
chatId?: number;
|
||||
chats?: FeedChatKind | null;
|
||||
folderId?: number | null;
|
||||
kind: FeedKind;
|
||||
onopen: (item: FeedItem, messageId: number) => void;
|
||||
}
|
||||
|
||||
let { kind, chats = null, chatId, onopen }: Props = $props();
|
||||
let { kind, chats = null, folderId = null, chatId, onopen }: Props = $props();
|
||||
|
||||
const PAGE = 30;
|
||||
const EMPTY_KEYS = {
|
||||
@@ -38,6 +39,7 @@
|
||||
const filter = $derived<FeedQuery>({
|
||||
chat_id: chatId,
|
||||
chat_kind: chats ?? undefined,
|
||||
folder_id: folderId ?? undefined,
|
||||
kind,
|
||||
limit: PAGE,
|
||||
});
|
||||
|
||||
@@ -55,12 +55,19 @@
|
||||
</header>
|
||||
<FeedFilters
|
||||
chats={filter.chats}
|
||||
folder={filter.folder}
|
||||
kind={filter.kind}
|
||||
onchats={(chats) => feed.filter(page.url, { ...filter, chats })}
|
||||
onfolder={(folder) => feed.filter(page.url, { ...filter, folder })}
|
||||
onkind={(kind) => feed.filter(page.url, { ...filter, kind })}
|
||||
/>
|
||||
<div class="feed-body custom-scroll">
|
||||
<FeedList chats={filter.chats} kind={filter.kind} onopen={open} />
|
||||
<FeedList
|
||||
chats={filter.chats}
|
||||
folderId={filter.folder}
|
||||
kind={filter.kind}
|
||||
onopen={open}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
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";
|
||||
|
||||
@@ -24,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);
|
||||
@@ -58,7 +60,7 @@
|
||||
starting = true;
|
||||
try {
|
||||
await enqueueBackfill(selected, media, true);
|
||||
toasts.success(t("jobs.backfillStarted"));
|
||||
started.show("backfill");
|
||||
version += 1;
|
||||
} catch {
|
||||
toasts.error(t("jobs.backfillFailed"));
|
||||
@@ -74,7 +76,7 @@
|
||||
syncing = true;
|
||||
try {
|
||||
await syncDialogs();
|
||||
toasts.success(t("jobs.syncStarted"));
|
||||
started.show("sync");
|
||||
version += 1;
|
||||
} catch {
|
||||
toasts.error(t("jobs.syncFailed"));
|
||||
@@ -90,7 +92,7 @@
|
||||
syncingContacts = true;
|
||||
try {
|
||||
await syncContacts();
|
||||
toasts.success(t("jobs.contactsStarted"));
|
||||
started.show("contacts");
|
||||
version += 1;
|
||||
} catch {
|
||||
toasts.error(t("jobs.contactsFailed"));
|
||||
@@ -110,8 +112,13 @@
|
||||
<p class="hint">{t("jobs.dialogsHint")}</p>
|
||||
<div class="action">
|
||||
<Button fluid loading={syncing} onclick={sync} variant="secondary">
|
||||
<Icon name="reload" />
|
||||
<span>{t("jobs.syncDialogs")}</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">{t("jobs.contactsHint")}</p>
|
||||
@@ -122,8 +129,13 @@
|
||||
onclick={syncContactList}
|
||||
variant="secondary"
|
||||
>
|
||||
<Icon name="user" />
|
||||
<span>{t("jobs.syncContacts")}</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>
|
||||
@@ -188,8 +200,13 @@
|
||||
onclick={start}
|
||||
variant="primary"
|
||||
>
|
||||
<Icon name="cloud-download" />
|
||||
<span>{t("jobs.startBackfill")}</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>
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
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 {
|
||||
@@ -24,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);
|
||||
|
||||
@@ -40,7 +51,7 @@
|
||||
queuing = true;
|
||||
try {
|
||||
await fetchMedia(chatId, media.message_id);
|
||||
toasts.success(t("media.queued"));
|
||||
queued.show(true);
|
||||
} catch {
|
||||
toasts.error(t("media.queueFailed"));
|
||||
} finally {
|
||||
@@ -66,8 +77,14 @@
|
||||
<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>
|
||||
|
||||
@@ -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}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { untrack } from "svelte";
|
||||
import { visible } from "#lib/actions/visible.js";
|
||||
import SearchEverywhere from "#lib/components/search/SearchEverywhere.svelte";
|
||||
import SearchMessageItem from "#lib/components/search/SearchMessageItem.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
@@ -15,7 +16,9 @@
|
||||
const DEBOUNCE_MS = 250;
|
||||
|
||||
const pager = createHitPager();
|
||||
const everywhere = createHitPager();
|
||||
let query = $state("");
|
||||
let deep = $state(false);
|
||||
let typing = $state(false);
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
@@ -23,14 +26,30 @@
|
||||
page.params.chatId ? Number(page.params.chatId) : null
|
||||
);
|
||||
|
||||
const needle = $derived(query.trim());
|
||||
const empty = $derived(
|
||||
needle !== "" &&
|
||||
!(typing || deep || pager.loading || pager.failed) &&
|
||||
pager.hits.length === 0
|
||||
);
|
||||
|
||||
function run() {
|
||||
typing = false;
|
||||
const value = query.trim();
|
||||
deep = false;
|
||||
everywhere.run(null);
|
||||
pager.run(
|
||||
value && chatId !== null ? { chat_id: chatId, query: value } : null
|
||||
needle && chatId !== null ? { chat_id: chatId, query: needle } : null
|
||||
);
|
||||
}
|
||||
|
||||
function searchEverywhere() {
|
||||
if (chatId === null) {
|
||||
return;
|
||||
}
|
||||
deep = true;
|
||||
everywhere.run({ chat_id: chatId, everywhere: true, query: needle });
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
if (chatId !== null) {
|
||||
untrack(run);
|
||||
@@ -46,11 +65,11 @@
|
||||
timer = setTimeout(run, DEBOUNCE_MS);
|
||||
}
|
||||
|
||||
function openHit(messageId: number) {
|
||||
function openHit(messageId: number, marks: string[]) {
|
||||
if (chatId === null) {
|
||||
return;
|
||||
}
|
||||
ui.requestJump(chatId, messageId);
|
||||
ui.requestJump(chatId, messageId, marks);
|
||||
if (isMobile()) {
|
||||
ui.closePanel();
|
||||
}
|
||||
@@ -73,9 +92,9 @@
|
||||
{#each pager.hits as hit (`${hit.chat_id}:${hit.message_id}`)}
|
||||
<SearchMessageItem
|
||||
{hit}
|
||||
href={search.hitHref(hit.chat_id, hit.message_id)}
|
||||
href={search.hitHref(hit.chat_id, hit.message_id, pager.terms)}
|
||||
inChat
|
||||
onclick={() => openHit(hit.message_id)}
|
||||
onclick={() => openHit(hit.message_id, pager.terms)}
|
||||
terms={pager.terms}
|
||||
/>
|
||||
{/each}
|
||||
@@ -96,7 +115,19 @@
|
||||
>{t("search.retry")}</Button
|
||||
>
|
||||
</div>
|
||||
{:else if query.trim() && !typing}
|
||||
{/if}
|
||||
<SearchEverywhere
|
||||
href={(hit) => search.hitHref(hit.chat_id, hit.message_id, [needle])}
|
||||
inChat
|
||||
{needle}
|
||||
onopen={(hit) => openHit(hit.message_id, [needle])}
|
||||
onstart={searchEverywhere}
|
||||
pager={everywhere}
|
||||
ready={!(typing || pager.loading || pager.failed || pager.hasMore)}
|
||||
shown={pager.hits}
|
||||
started={deep}
|
||||
/>
|
||||
{#if empty}
|
||||
<EmptyState title={t("search.nothing")} />
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,208 @@
|
||||
<script lang="ts">
|
||||
import { ripple } from "#lib/actions/ripple.js";
|
||||
import { visible } from "#lib/actions/visible.js";
|
||||
import type { SearchHit } from "#lib/api/types.js";
|
||||
import SearchMessageItem from "#lib/components/search/SearchMessageItem.svelte";
|
||||
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 { formatDate } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import {
|
||||
EVERYWHERE_MIN,
|
||||
type HitPager,
|
||||
hitKey,
|
||||
} from "#lib/stores/search.svelte.js";
|
||||
|
||||
interface Props {
|
||||
href: (hit: SearchHit) => string;
|
||||
inChat?: boolean;
|
||||
needle: string;
|
||||
onopen?: (hit: SearchHit) => void;
|
||||
onstart: () => void;
|
||||
pager: HitPager;
|
||||
ready: boolean;
|
||||
shown: SearchHit[];
|
||||
started: boolean;
|
||||
}
|
||||
|
||||
let {
|
||||
href,
|
||||
inChat = false,
|
||||
needle,
|
||||
onopen,
|
||||
onstart,
|
||||
pager,
|
||||
ready,
|
||||
shown,
|
||||
started,
|
||||
}: Props = $props();
|
||||
|
||||
const hits = $derived.by(() => {
|
||||
const seen = new Set(shown.map(hitKey));
|
||||
return pager.hits.filter((hit) => {
|
||||
const key = hitKey(hit);
|
||||
const fresh = !seen.has(key);
|
||||
seen.add(key);
|
||||
return fresh;
|
||||
});
|
||||
});
|
||||
const busy = $derived(pager.loading || pager.appending);
|
||||
|
||||
function retry() {
|
||||
if (pager.hasMore) {
|
||||
pager.more();
|
||||
} else {
|
||||
pager.retry();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if !started}
|
||||
{#if ready && needle.length >= EVERYWHERE_MIN}
|
||||
<button
|
||||
class="start"
|
||||
onclick={onstart}
|
||||
type="button"
|
||||
class:in-chat={inChat}
|
||||
use:ripple
|
||||
>
|
||||
<span class="glyph"><Icon name="search" size="1.5rem" /></span>
|
||||
<span class="body">
|
||||
<span class="label">{t("search.everywhere")}</span>
|
||||
<span class="hint">{t("search.everywhereHint")}</span>
|
||||
</span>
|
||||
</button>
|
||||
{/if}
|
||||
{:else}
|
||||
{#if hits.length > 0}
|
||||
<div class="section-label">{t("search.everywhereSection")}</div>
|
||||
{#each hits as hit (hitKey(hit))}
|
||||
<SearchMessageItem
|
||||
{hit}
|
||||
href={href(hit)}
|
||||
{inChat}
|
||||
onclick={() => onopen?.(hit)}
|
||||
terms={[needle]}
|
||||
/>
|
||||
{/each}
|
||||
{/if}
|
||||
{#if busy}
|
||||
<div class="status">
|
||||
<Spinner size="1.25rem" />
|
||||
<span>
|
||||
{pager.scannedTo
|
||||
? t("search.everywhereScanned", { date: formatDate(pager.scannedTo) })
|
||||
: t("search.everywhereScanning")}
|
||||
</span>
|
||||
</div>
|
||||
{:else if pager.failed}
|
||||
<div class="status failed">
|
||||
<span>{t("search.failed")}</span>
|
||||
<Button onclick={retry} variant="text">{t("search.retry")}</Button>
|
||||
</div>
|
||||
{:else if pager.hasMore}
|
||||
<div class="sentinel" use:visible={() => pager.more()}></div>
|
||||
{:else if hits.length === 0}
|
||||
<div class="status">{t("search.everywhereNothing")}</div>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
<style lang="scss">
|
||||
.start {
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.625rem;
|
||||
|
||||
width: 100%;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
.glyph {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
|
||||
color: var(--color-primary);
|
||||
|
||||
.in-chat & {
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
.body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.1875rem;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 0.9375rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-primary);
|
||||
}
|
||||
|
||||
.hint {
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.section-label {
|
||||
padding: 0.625rem 0.75rem 0.375rem;
|
||||
font-size: 0.875rem;
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-primary);
|
||||
}
|
||||
|
||||
.status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.5rem;
|
||||
|
||||
padding: 1rem 0.75rem 1.5rem;
|
||||
|
||||
font-size: 0.875rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
color: var(--color-text-secondary);
|
||||
|
||||
&.failed {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
.sentinel {
|
||||
height: 1px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,12 +1,12 @@
|
||||
<script lang="ts">
|
||||
import { ripple } from "#lib/actions/ripple.js";
|
||||
import type { SearchHit } from "#lib/api/types.js";
|
||||
import type { FoundWhere, SearchHit } from "#lib/api/types.js";
|
||||
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 { mediaKindLabel } from "#lib/format/media.js";
|
||||
import { peerName } from "#lib/format/peer.js";
|
||||
import { highlight } from "#lib/format/search.js";
|
||||
import { highlight, highlightMarks } 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";
|
||||
@@ -22,6 +22,17 @@
|
||||
|
||||
let { hit, href, inChat = false, onclick, terms }: Props = $props();
|
||||
|
||||
const FOUND_ICONS: Record<FoundWhere, string> = {
|
||||
button: "bot-command",
|
||||
data: "info",
|
||||
file: "document",
|
||||
forward: "forward",
|
||||
link: "link",
|
||||
preview: "link",
|
||||
reply: "reply",
|
||||
text: "search",
|
||||
};
|
||||
|
||||
const chat = $derived(chats.byId(hit.chat_id));
|
||||
const ownId = $derived(accounts.selected?.tg_user_id ?? null);
|
||||
const own = $derived(hit.sender_id !== null && hit.sender_id === ownId);
|
||||
@@ -81,7 +92,21 @@
|
||||
const kind = $derived(
|
||||
hit.source === "stt" || !body ? mediaKindLabel(hit.media_kind) : null
|
||||
);
|
||||
const segments = $derived(highlight(body, terms));
|
||||
const byData = $derived(hit.source === "data");
|
||||
const segments = $derived(
|
||||
byData ? highlightMarks(body, terms) : highlight(body, terms)
|
||||
);
|
||||
const found = $derived(
|
||||
hit.found && hit.found.where !== "text" ? hit.found : null
|
||||
);
|
||||
const foundLabel = $derived.by(() => {
|
||||
if (found === null) {
|
||||
return "";
|
||||
}
|
||||
return found.where === "button"
|
||||
? t("search.found.button", { text: found.button ?? "" })
|
||||
: t(`search.found.${found.where}`);
|
||||
});
|
||||
</script>
|
||||
|
||||
<a class="hit" {href} {onclick} use:ripple>
|
||||
@@ -126,6 +151,21 @@
|
||||
{/each}</span
|
||||
>
|
||||
</div>
|
||||
{#if found}
|
||||
<div class="note found" title={found.path}>
|
||||
<Icon name={FOUND_ICONS[found.where]} size="0.875rem" />
|
||||
<span class="found-label">{foundLabel}:</span>
|
||||
<span class="found-value"
|
||||
>{#each highlightMarks(found.value, terms) as segment, index (index)}
|
||||
{#if segment.hit}
|
||||
<mark>{segment.text}</mark>
|
||||
{:else}
|
||||
{segment.text}
|
||||
{/if}
|
||||
{/each}</span
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
{#if hit.source === "version"}
|
||||
<div
|
||||
class="note"
|
||||
@@ -244,6 +284,22 @@
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.found {
|
||||
font-style: normal;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.found-label {
|
||||
flex-shrink: 0;
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.found-value {
|
||||
overflow: hidden;
|
||||
min-width: 0;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
mark {
|
||||
padding: 0 0.0625rem;
|
||||
border-radius: 0.25rem;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { visible } from "#lib/actions/visible.js";
|
||||
import ChatListItem from "#lib/components/ChatListItem.svelte";
|
||||
import DiscoverResultItem from "#lib/components/search/DiscoverResultItem.svelte";
|
||||
import SearchEverywhere from "#lib/components/search/SearchEverywhere.svelte";
|
||||
import SearchFilters from "#lib/components/search/SearchFilters.svelte";
|
||||
import SearchMessageItem from "#lib/components/search/SearchMessageItem.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
@@ -14,7 +15,7 @@
|
||||
import { goto } from "$app/navigation";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const { messages } = search;
|
||||
const { everywhere, messages } = search;
|
||||
let scroller = $state<HTMLDivElement | null>(null);
|
||||
|
||||
$effect(() => {
|
||||
@@ -25,12 +26,22 @@
|
||||
});
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
const key = search.everywhereRequest;
|
||||
untrack(() => search.syncEverywhere(key));
|
||||
});
|
||||
|
||||
const activeChatId = $derived(
|
||||
page.params.chatId ? Number(page.params.chatId) : null
|
||||
);
|
||||
const showChats = $derived(!search.filtered && search.chatHits.length > 0);
|
||||
const showPeers = $derived(!search.filtered && search.peerHits.length > 0);
|
||||
const hasMessages = $derived(messages.hits.length > 0);
|
||||
const needle = $derived(search.text.trim());
|
||||
const searchedAll = $derived(
|
||||
!(search.typing || messages.loading || messages.failed || messages.hasMore)
|
||||
);
|
||||
const deep = $derived(search.everywhereRequest !== "");
|
||||
const empty = $derived(
|
||||
!(
|
||||
search.typing ||
|
||||
@@ -38,7 +49,8 @@
|
||||
messages.failed ||
|
||||
showChats ||
|
||||
showPeers ||
|
||||
hasMessages
|
||||
hasMessages ||
|
||||
deep
|
||||
)
|
||||
);
|
||||
|
||||
@@ -74,8 +86,9 @@
|
||||
{#each messages.hits as hit (`${hit.chat_id}:${hit.message_id}`)}
|
||||
<SearchMessageItem
|
||||
{hit}
|
||||
href={search.hitHref(hit.chat_id, hit.message_id)}
|
||||
onclick={() => ui.requestJump(hit.chat_id, hit.message_id)}
|
||||
href={search.hitHref(hit.chat_id, hit.message_id, messages.terms)}
|
||||
onclick={() =>
|
||||
ui.requestJump(hit.chat_id, hit.message_id, messages.terms)}
|
||||
terms={messages.terms}
|
||||
/>
|
||||
{/each}
|
||||
@@ -98,6 +111,17 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<SearchEverywhere
|
||||
href={(hit) => search.hitHref(hit.chat_id, hit.message_id, [needle])}
|
||||
{needle}
|
||||
onopen={(hit) => ui.requestJump(hit.chat_id, hit.message_id, [needle])}
|
||||
onstart={() => search.searchEverywhere()}
|
||||
pager={everywhere}
|
||||
ready={searchedAll}
|
||||
shown={messages.hits}
|
||||
started={deep}
|
||||
/>
|
||||
|
||||
{#if empty}
|
||||
<EmptyState title={t("search.nothing")} />
|
||||
{/if}
|
||||
|
||||
@@ -55,9 +55,8 @@
|
||||
loginId = "";
|
||||
await accounts.load();
|
||||
if (state.account) {
|
||||
accounts.select(state.account.account_id);
|
||||
accounts.switchTo(state.account.account_id);
|
||||
}
|
||||
toasts.success(t("login.added"));
|
||||
open = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
<script lang="ts">
|
||||
import { captureLine } from "#lib/format/capture.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { capture } from "#lib/stores/capture.svelte.js";
|
||||
|
||||
const status = $derived(capture.status);
|
||||
</script>
|
||||
|
||||
{#if status}
|
||||
<div class="capture-line" role="status" class:quiet={!status.live}>
|
||||
<span class="mark"><span class="dot"></span></span>
|
||||
<span class="label"
|
||||
>{captureLine(status, accounts.selected?.is_bot ?? false)}</span
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style lang="scss">
|
||||
.capture-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 1.5rem;
|
||||
|
||||
min-height: 3.5rem;
|
||||
padding: 0 1.25rem;
|
||||
|
||||
font-size: 1rem;
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.mark {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
}
|
||||
|
||||
.dot {
|
||||
width: 0.625rem;
|
||||
height: 0.625rem;
|
||||
border-radius: 50%;
|
||||
background-color: var(--color-green);
|
||||
}
|
||||
|
||||
.quiet .dot {
|
||||
background-color: var(--color-error);
|
||||
}
|
||||
|
||||
.label {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
@@ -7,7 +7,7 @@
|
||||
import SettingsItem from "#lib/components/settings/SettingsItem.svelte";
|
||||
import Button from "#lib/components/ui/Button.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import { accountName } from "#lib/format/peer.js";
|
||||
import { accountName, formatPhone } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
<AccountAvatar account={current} size={5} />
|
||||
<div class="name">{accountName(current)}</div>
|
||||
{#if current.phone}
|
||||
<div class="phone">+{current.phone}</div>
|
||||
<div class="phone">{formatPhone(current.phone)}</div>
|
||||
{/if}
|
||||
{#if !current.is_active}
|
||||
<div class="inactive">{t("account.inactive")}</div>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import AlertBadge from "#lib/components/alerts/AlertBadge.svelte";
|
||||
import About from "#lib/components/settings/About.svelte";
|
||||
import Appearance from "#lib/components/settings/Appearance.svelte";
|
||||
import CaptureLine from "#lib/components/settings/CaptureLine.svelte";
|
||||
import Language from "#lib/components/settings/Language.svelte";
|
||||
import MyAccount from "#lib/components/settings/MyAccount.svelte";
|
||||
import SettingsItem from "#lib/components/settings/SettingsItem.svelte";
|
||||
@@ -39,6 +40,7 @@
|
||||
</div>
|
||||
|
||||
<div class="section">
|
||||
<CaptureLine />
|
||||
<SettingsItem
|
||||
icon="settings"
|
||||
label={t("settings.policy")}
|
||||
@@ -83,6 +85,11 @@
|
||||
<AlertBadge inline />
|
||||
{/snippet}
|
||||
</SettingsItem>
|
||||
<SettingsItem
|
||||
icon="note"
|
||||
label={t("notes.title")}
|
||||
onclick={() => ui.openPanel("notes")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<About />
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
import { formatShareLimits } from "#lib/format/shares.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
import { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
interface Props {
|
||||
@@ -72,6 +73,8 @@
|
||||
let maxDownloads = $state<number | null>(null);
|
||||
let showQr = $state(false);
|
||||
let token = 0;
|
||||
const saved = createFlash<number>();
|
||||
const revoked = createFlash<ShareSubject>();
|
||||
|
||||
const settings = $derived<ShareSettings>({
|
||||
expiresInSeconds: expiresIn === KEEP ? null : expiresIn,
|
||||
@@ -125,7 +128,6 @@
|
||||
busy = true;
|
||||
try {
|
||||
adopt(await createShare(subject, settings));
|
||||
toasts.success(t("shares.opened"));
|
||||
} catch (error) {
|
||||
fail(error, "shares.openFailed");
|
||||
} finally {
|
||||
@@ -139,8 +141,9 @@
|
||||
}
|
||||
busy = true;
|
||||
try {
|
||||
adopt(await updateShare(share.id, settings));
|
||||
toasts.success(t("shares.updated"));
|
||||
const next = await updateShare(share.id, settings);
|
||||
adopt(next);
|
||||
saved.show(next.id);
|
||||
} catch (error) {
|
||||
fail(error, "shares.updateFailed");
|
||||
} finally {
|
||||
@@ -149,15 +152,15 @@
|
||||
}
|
||||
|
||||
async function revoke() {
|
||||
if (!share || busy) {
|
||||
if (!(share && subject) || busy) {
|
||||
return;
|
||||
}
|
||||
const target = subject;
|
||||
busy = true;
|
||||
try {
|
||||
await revokeShare(share.id);
|
||||
adopt(null);
|
||||
toasts.success(t("shares.revokedToast"));
|
||||
open = false;
|
||||
revoked.show(target);
|
||||
} catch (error) {
|
||||
fail(error, "shares.revokeFailed");
|
||||
} finally {
|
||||
@@ -314,12 +317,22 @@
|
||||
|
||||
{#if !loading}
|
||||
<div class="dialog-actions">
|
||||
{#if share}
|
||||
{#if subject && revoked.current === subject}
|
||||
<p class="done">
|
||||
<Icon name="check" size="1.25rem" />
|
||||
{t("shares.accessRevoked")}
|
||||
</p>
|
||||
{:else if share}
|
||||
<Button loading={busy} onclick={revoke} pill variant="danger">
|
||||
{t("shares.revoke")}
|
||||
</Button>
|
||||
<Button loading={busy} onclick={applyLimits} pill>
|
||||
{t("common.save")}
|
||||
{#if saved.current === share.id}
|
||||
<Icon name="check" />
|
||||
{t("shares.saved")}
|
||||
{:else}
|
||||
{t("common.save")}
|
||||
{/if}
|
||||
</Button>
|
||||
{:else}
|
||||
<Button fluid loading={busy} onclick={publish} pill>
|
||||
@@ -333,6 +346,20 @@
|
||||
</Dialog.Root>
|
||||
|
||||
<style lang="scss">
|
||||
.done {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
gap: 0.375rem;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
height: 3rem;
|
||||
margin: 0;
|
||||
|
||||
font-weight: var(--font-weight-medium);
|
||||
color: var(--color-text-green);
|
||||
}
|
||||
|
||||
.center {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { SvelteSet } from "svelte/reactivity";
|
||||
import {
|
||||
deleteShare,
|
||||
listShares,
|
||||
@@ -11,6 +12,7 @@
|
||||
import ShareLinkField from "#lib/components/shares/ShareLinkField.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 EmptyState from "#lib/components/ui/EmptyState.svelte";
|
||||
import Icon from "#lib/components/ui/Icon.svelte";
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
@@ -19,6 +21,7 @@
|
||||
import { formatDownloads, formatExpiry } from "#lib/format/shares.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.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";
|
||||
import { ui } from "#lib/stores/ui.svelte.js";
|
||||
@@ -31,10 +34,14 @@
|
||||
let filter = $state<Filter>("active");
|
||||
let expanded = $state<number | null>(null);
|
||||
let token = 0;
|
||||
const kept = new SvelteSet<number>();
|
||||
const done = createFlash<number>();
|
||||
|
||||
const visible = $derived(
|
||||
filter === "active"
|
||||
? items.filter((item) => shareState(item) === "active")
|
||||
? items.filter(
|
||||
(item) => kept.has(item.id) || shareState(item) === "active"
|
||||
)
|
||||
: items
|
||||
);
|
||||
const activeCount = $derived(
|
||||
@@ -50,6 +57,7 @@
|
||||
const rows = await listShares(activeOnly);
|
||||
if (current === token) {
|
||||
items = rows;
|
||||
kept.clear();
|
||||
}
|
||||
} catch {
|
||||
if (current === token) {
|
||||
@@ -79,15 +87,11 @@
|
||||
ui.closePanel();
|
||||
}
|
||||
|
||||
async function copy(share: FileShare) {
|
||||
await navigator.clipboard.writeText(shareUrl(share));
|
||||
toasts.success(t("shares.copied"));
|
||||
}
|
||||
|
||||
async function revoke(share: FileShare) {
|
||||
try {
|
||||
replace(await revokeShare(share.id));
|
||||
toasts.success(t("shares.revokedToast"));
|
||||
kept.add(share.id);
|
||||
done.show(share.id);
|
||||
} catch {
|
||||
toasts.error(t("shares.revokeFailed"));
|
||||
}
|
||||
@@ -96,7 +100,7 @@
|
||||
async function reissue(share: FileShare) {
|
||||
try {
|
||||
replace(await reissueShare(share.id));
|
||||
toasts.success(t("shares.reissued"));
|
||||
done.show(share.id);
|
||||
} catch {
|
||||
toasts.error(t("shares.reissueFailed"));
|
||||
}
|
||||
@@ -205,9 +209,12 @@
|
||||
</button>
|
||||
{/snippet}
|
||||
{#snippet menu()}
|
||||
<ContextMenuItem icon="copy" onselect={() => copy(share)}>
|
||||
{t("shares.copy")}
|
||||
</ContextMenuItem>
|
||||
<CopyItem
|
||||
done={t("shares.copied")}
|
||||
icon="copy"
|
||||
label={t("shares.copy")}
|
||||
text={() => shareUrl(share)}
|
||||
/>
|
||||
{#if share.message_id !== null || share.peer_id !== null}
|
||||
<ContextMenuItem icon="reply" onselect={() => jump(share)}>
|
||||
{t("ui.jumpToMessage")}
|
||||
@@ -247,7 +254,14 @@
|
||||
<Icon name="reply" size="1rem" />{t("shares.toMessage")}
|
||||
</button>
|
||||
{/if}
|
||||
{#if state === "active"}
|
||||
{#if done.current === share.id}
|
||||
<span class="done">
|
||||
<Icon name="check" size="1rem" />
|
||||
{state === "active"
|
||||
? t("shares.reissued")
|
||||
: t("shares.accessRevoked")}
|
||||
</span>
|
||||
{:else if state === "active"}
|
||||
<button
|
||||
class="pill danger"
|
||||
onclick={() => revoke(share)}
|
||||
@@ -461,6 +475,18 @@
|
||||
}
|
||||
}
|
||||
|
||||
.done {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
|
||||
padding: 0.3125rem 0;
|
||||
border: 1px solid transparent;
|
||||
|
||||
font-size: 0.8125rem;
|
||||
color: var(--color-text-green);
|
||||
}
|
||||
|
||||
.footnote {
|
||||
margin: 0;
|
||||
padding: 0 1rem 1rem;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
import { peerName } from "#lib/format/peer.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
|
||||
interface Group {
|
||||
@@ -45,6 +46,7 @@
|
||||
let viewerItems = $state<StoryView[]>([]);
|
||||
let viewerPeerId = $state(0);
|
||||
let backfilling = $state<number | null>(null);
|
||||
const started = createFlash<number>();
|
||||
|
||||
async function load() {
|
||||
const current = token;
|
||||
@@ -150,7 +152,7 @@
|
||||
backfilling = peerId;
|
||||
try {
|
||||
await enqueueStoriesBackfill(peerId);
|
||||
toasts.success(t("stories.backfillStarted"));
|
||||
started.show(peerId);
|
||||
} catch {
|
||||
toasts.error(t("stories.backfillFailed"));
|
||||
} finally {
|
||||
@@ -178,6 +180,10 @@
|
||||
{/if}
|
||||
{:else}
|
||||
{#each groups as group (group.peerId)}
|
||||
{@const fresh = started.current === group.peerId}
|
||||
{@const backfillLabel = fresh
|
||||
? t("stories.backfillStarted")
|
||||
: t("stories.loadOlderStories")}
|
||||
<section class="group">
|
||||
<header class="group-head">
|
||||
<button
|
||||
@@ -200,14 +206,15 @@
|
||||
</span>
|
||||
</button>
|
||||
<Button
|
||||
aria-label={t("stories.loadOlderStories")}
|
||||
aria-label={backfillLabel}
|
||||
loading={backfilling === group.peerId}
|
||||
onclick={() => backfill(group.peerId)}
|
||||
round
|
||||
smaller
|
||||
title={backfillLabel}
|
||||
variant="translucent"
|
||||
>
|
||||
<Icon name="cloud-download" />
|
||||
<Icon name={fresh ? "check" : "cloud-download"} />
|
||||
</Button>
|
||||
</header>
|
||||
{#if expanded[group.peerId]}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
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 { createFlash } from "#lib/stores/flash.svelte.js";
|
||||
import { toasts } from "#lib/stores/toasts.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
@@ -27,6 +28,7 @@
|
||||
);
|
||||
|
||||
let backfilling = $state(false);
|
||||
const started = createFlash<number>();
|
||||
|
||||
let items = $state<StoryView[]>([]);
|
||||
let loading = $state(false);
|
||||
@@ -109,7 +111,7 @@
|
||||
backfilling = true;
|
||||
try {
|
||||
await enqueueStoriesBackfill(id);
|
||||
toasts.success(t("stories.backfillStarted"));
|
||||
started.show(id);
|
||||
} catch {
|
||||
toasts.error(t("stories.backfillFailed"));
|
||||
} finally {
|
||||
@@ -137,7 +139,11 @@
|
||||
smaller
|
||||
variant="secondary"
|
||||
>
|
||||
<Icon name="cloud-download" />{t("stories.loadOlder")}
|
||||
{#if started.current === peerId}
|
||||
<Icon name="check" />{t("stories.backfillStarted")}
|
||||
{:else}
|
||||
<Icon name="cloud-download" />{t("stories.loadOlder")}
|
||||
{/if}
|
||||
</Button>
|
||||
<Button
|
||||
aria-label={t("ui.refresh")}
|
||||
|
||||
@@ -33,13 +33,14 @@
|
||||
loading = false,
|
||||
type = "button",
|
||||
disabled = false,
|
||||
class: className,
|
||||
children,
|
||||
...rest
|
||||
}: Props = $props();
|
||||
</script>
|
||||
|
||||
<button
|
||||
class="Button {variant}"
|
||||
class={["Button", variant, className]}
|
||||
{disabled}
|
||||
{type}
|
||||
class:disabled
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
<script lang="ts" module>
|
||||
import { createContext } from "svelte";
|
||||
|
||||
type PointerHandler = (event: PointerEvent) => void;
|
||||
|
||||
const claimed = new WeakSet<Event>();
|
||||
|
||||
export const [menuCloser, provideMenuCloser] = createContext<() => void>();
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
@@ -18,6 +22,10 @@
|
||||
let open = $state(false);
|
||||
let suppressClick = false;
|
||||
|
||||
provideMenuCloser(() => {
|
||||
open = false;
|
||||
});
|
||||
|
||||
function triggerProps(props: Record<string, unknown>) {
|
||||
const onpointerdown = props.onpointerdown as PointerHandler;
|
||||
const onpointerup = props.onpointerup as PointerHandler;
|
||||
@@ -55,7 +63,12 @@
|
||||
{/snippet}
|
||||
</ContextMenu.Trigger>
|
||||
<ContextMenu.Portal>
|
||||
<ContextMenu.Content class="bg-menu-content">
|
||||
<ContextMenu.Content
|
||||
align="start"
|
||||
class="bg-menu-content"
|
||||
collisionPadding={8}
|
||||
side="bottom"
|
||||
>
|
||||
{@render menu()}
|
||||
</ContextMenu.Content>
|
||||
</ContextMenu.Portal>
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
<script lang="ts">
|
||||
import { ContextMenu } from "bits-ui";
|
||||
import { menuCloser } from "./ContextMenu.svelte";
|
||||
import Icon from "./Icon.svelte";
|
||||
|
||||
interface Props {
|
||||
done: string;
|
||||
icon: string;
|
||||
label: string;
|
||||
text: () => string;
|
||||
}
|
||||
|
||||
const { done, icon, label, text }: Props = $props();
|
||||
|
||||
const CLOSE_DELAY = 900;
|
||||
|
||||
const close = menuCloser();
|
||||
let copied = $state(false);
|
||||
|
||||
async function copy() {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text());
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
copied = true;
|
||||
setTimeout(close, CLOSE_DELAY);
|
||||
}
|
||||
</script>
|
||||
|
||||
<ContextMenu.Item class="bg-menu-item" closeOnSelect={false} onSelect={copy}>
|
||||
<Icon name={copied ? "check" : icon} size="1.125rem" />
|
||||
{copied ? done : label}
|
||||
</ContextMenu.Item>
|
||||
@@ -49,9 +49,5 @@
|
||||
&.error {
|
||||
background-color: var(--color-error);
|
||||
}
|
||||
|
||||
&.success {
|
||||
background-color: var(--color-green);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,14 @@
|
||||
import type { CaptureStatus } from "#lib/api/capture.js";
|
||||
import { formatSince } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
export function captureLine(status: CaptureStatus, bot: boolean): string {
|
||||
if (status.live && status.since) {
|
||||
return t("capture.live", { when: formatSince(status.since) });
|
||||
}
|
||||
if (status.last_seen) {
|
||||
const when = formatSince(status.last_seen);
|
||||
return bot ? t("capture.botQuiet", { when }) : t("capture.quiet", { when });
|
||||
}
|
||||
return bot ? t("capture.botNever") : t("capture.never");
|
||||
}
|
||||
@@ -3,6 +3,15 @@ import { locale } from "#lib/i18n/locale.svelte.js";
|
||||
const OPTIONS = {
|
||||
date: { day: "numeric", month: "short", year: "numeric" },
|
||||
day: { day: "numeric", month: "short" },
|
||||
exact: {
|
||||
day: "numeric",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
month: "long",
|
||||
second: "2-digit",
|
||||
weekday: "long",
|
||||
year: "numeric",
|
||||
},
|
||||
full: {
|
||||
day: "numeric",
|
||||
hour: "2-digit",
|
||||
@@ -12,6 +21,14 @@ const OPTIONS = {
|
||||
},
|
||||
longDay: { day: "numeric", month: "long", weekday: "long" },
|
||||
offset: { timeZoneName: "shortOffset" },
|
||||
stamp: { day: "numeric", hour: "2-digit", minute: "2-digit", month: "short" },
|
||||
stampYear: {
|
||||
day: "numeric",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
month: "short",
|
||||
year: "numeric",
|
||||
},
|
||||
time: { hour: "2-digit", minute: "2-digit" },
|
||||
} satisfies Record<string, Intl.DateTimeFormatOptions>;
|
||||
|
||||
@@ -47,6 +64,37 @@ export function formatFull(iso: string): string {
|
||||
return format("full", new Date(iso));
|
||||
}
|
||||
|
||||
export function formatExact(iso: string): string {
|
||||
return format("exact", new Date(iso));
|
||||
}
|
||||
|
||||
function stampKind(date: Date): "stamp" | "stampYear" {
|
||||
return date.getFullYear() === new Date().getFullYear()
|
||||
? "stamp"
|
||||
: "stampYear";
|
||||
}
|
||||
|
||||
export function formatStamp(iso: string): string {
|
||||
const date = new Date(iso);
|
||||
return format(stampKind(date), date);
|
||||
}
|
||||
|
||||
export function formatSince(iso: string): string {
|
||||
const date = new Date(iso);
|
||||
if (date.toDateString() === new Date().toDateString()) {
|
||||
return format("time", date);
|
||||
}
|
||||
return format(stampKind(date), date);
|
||||
}
|
||||
|
||||
export function formatSpanRange(startIso: string, endIso: string): string {
|
||||
const start = new Date(startIso);
|
||||
const end = new Date(endIso);
|
||||
const kind =
|
||||
start.toDateString() === end.toDateString() ? "time" : stampKind(start);
|
||||
return formatter(kind).formatRange(start, end);
|
||||
}
|
||||
|
||||
export function formatListDate(iso: string | null): string {
|
||||
if (!iso) {
|
||||
return "";
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { Account, PeerView } from "#lib/api/types.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
const PEER_COLOR_COUNT = 7;
|
||||
|
||||
@@ -11,7 +12,7 @@ export function peerName(peer: PeerView | null): string {
|
||||
return "";
|
||||
}
|
||||
if (peer.is_deleted_account) {
|
||||
return "Удалённый аккаунт";
|
||||
return t("chat.deletedAccount");
|
||||
}
|
||||
const parts = [peer.first_name, peer.last_name].filter(Boolean);
|
||||
if (parts.length > 0) {
|
||||
@@ -20,7 +21,7 @@ export function peerName(peer: PeerView | null): string {
|
||||
if (peer.username) {
|
||||
return `@${peer.username}`;
|
||||
}
|
||||
return "Удалённый аккаунт";
|
||||
return t("chat.deletedAccount");
|
||||
}
|
||||
|
||||
export function accountName(account: Account): string {
|
||||
@@ -46,3 +47,7 @@ export function initials(name: string): string {
|
||||
const last = lastWord ? lastWord[0] : "";
|
||||
return (first + last).toUpperCase();
|
||||
}
|
||||
|
||||
export function formatPhone(phone: string): string {
|
||||
return phone.startsWith("+") ? phone : `+${phone}`;
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { PresenceSample } from "#lib/api/types.js";
|
||||
import { formatDay, formatTime } from "#lib/format/datetime.js";
|
||||
import { plural } from "#lib/format/shares.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import type { MessageKey } from "#lib/i18n/messages.js";
|
||||
|
||||
const SECONDS_IN_MINUTE = 60;
|
||||
const MINUTES_IN_HOUR = 60;
|
||||
@@ -8,32 +9,14 @@ const SECONDS_IN_HOUR = 3600;
|
||||
const MS_IN_MINUTE = 60_000;
|
||||
const SECONDS_IN_DAY = 86_400;
|
||||
const MS_IN_DAY = 86_400_000;
|
||||
const DAYS_IN_WEEK = 7;
|
||||
const MONDAY = Date.UTC(2024, 0, 1);
|
||||
|
||||
const TEXT = {
|
||||
ago: (minutes: number) =>
|
||||
`был(а) ${minutes} ${plural(minutes, "минуту", "минуты", "минут")} назад`,
|
||||
days: (days: number) => `${days} ${plural(days, "день", "дня", "дней")}`,
|
||||
hours: (hours: number) => `${hours} ч`,
|
||||
hoursMinutes: (hours: number, minutes: number) => `${hours} ч ${minutes} мин`,
|
||||
justNow: "был(а) только что",
|
||||
lastMonth: "был(а) в этом месяце",
|
||||
lastWeek: "был(а) на этой неделе",
|
||||
longAgo: "был(а) давно",
|
||||
minutes: (minutes: number) => `${minutes} мин`,
|
||||
offline: "не в сети",
|
||||
on: (day: string, time: string) => `был(а) ${day} в ${time}`,
|
||||
online: "в сети",
|
||||
recently: "был(а) недавно",
|
||||
seconds: (seconds: number) => `${seconds} с`,
|
||||
today: (time: string) => `был(а) сегодня в ${time}`,
|
||||
yesterday: (time: string) => `был(а) вчера в ${time}`,
|
||||
};
|
||||
|
||||
const FUZZY: Record<string, string> = {
|
||||
last_month: TEXT.lastMonth,
|
||||
last_week: TEXT.lastWeek,
|
||||
long_time_ago: TEXT.longAgo,
|
||||
recently: TEXT.recently,
|
||||
const FUZZY: Record<string, MessageKey> = {
|
||||
last_month: "presence.lastMonth",
|
||||
last_week: "presence.lastWeek",
|
||||
long_time_ago: "presence.longAgo",
|
||||
recently: "presence.recently",
|
||||
};
|
||||
|
||||
export function isOnline(
|
||||
@@ -50,20 +33,20 @@ function lastSeen(iso: string, now: number): string {
|
||||
const date = new Date(iso);
|
||||
const minutes = Math.floor((now - date.getTime()) / MS_IN_MINUTE);
|
||||
if (minutes < 1) {
|
||||
return TEXT.justNow;
|
||||
return t("presence.justNow");
|
||||
}
|
||||
if (minutes < MINUTES_IN_HOUR) {
|
||||
return TEXT.ago(minutes);
|
||||
return t("presence.ago", { count: minutes });
|
||||
}
|
||||
const time = formatTime(iso);
|
||||
const today = new Date(now);
|
||||
if (date.toDateString() === today.toDateString()) {
|
||||
return TEXT.today(time);
|
||||
return t("presence.todayAt", { time });
|
||||
}
|
||||
if (date.toDateString() === new Date(now - MS_IN_DAY).toDateString()) {
|
||||
return TEXT.yesterday(time);
|
||||
return t("presence.yesterdayAt", { time });
|
||||
}
|
||||
return TEXT.on(formatDay(iso), time);
|
||||
return t("presence.on", { day: formatDay(iso), time });
|
||||
}
|
||||
|
||||
export function formatPresence(
|
||||
@@ -72,29 +55,31 @@ export function formatPresence(
|
||||
): string {
|
||||
if (sample.status === "online") {
|
||||
return isOnline(sample, now)
|
||||
? TEXT.online
|
||||
? t("presence.online")
|
||||
: lastSeen(sample.next_offline_date ?? sample.ts, now);
|
||||
}
|
||||
const fuzzy = FUZZY[sample.status];
|
||||
if (fuzzy) {
|
||||
return fuzzy;
|
||||
return t(fuzzy);
|
||||
}
|
||||
return sample.last_online_date
|
||||
? lastSeen(sample.last_online_date, now)
|
||||
: TEXT.offline;
|
||||
: t("presence.offline");
|
||||
}
|
||||
|
||||
export function formatSpan(seconds: number): string {
|
||||
if (seconds < SECONDS_IN_MINUTE) {
|
||||
return TEXT.seconds(Math.round(seconds));
|
||||
return t("presence.seconds", { seconds: Math.round(seconds) });
|
||||
}
|
||||
const minutes = Math.round(seconds / SECONDS_IN_MINUTE);
|
||||
if (minutes < MINUTES_IN_HOUR) {
|
||||
return TEXT.minutes(minutes);
|
||||
return t("presence.minutes", { minutes });
|
||||
}
|
||||
const hours = Math.floor(minutes / MINUTES_IN_HOUR);
|
||||
const rest = minutes % MINUTES_IN_HOUR;
|
||||
return rest === 0 ? TEXT.hours(hours) : TEXT.hoursMinutes(hours, rest);
|
||||
return rest === 0
|
||||
? t("presence.hours", { hours })
|
||||
: t("presence.hoursMinutes", { hours, minutes: rest });
|
||||
}
|
||||
|
||||
export function formatClock(secondsOfDay: number): string {
|
||||
@@ -111,7 +96,20 @@ export function formatLongSpan(seconds: number): string {
|
||||
}
|
||||
const days = Math.floor(seconds / SECONDS_IN_DAY);
|
||||
const hours = Math.round((seconds % SECONDS_IN_DAY) / SECONDS_IN_HOUR);
|
||||
return hours === 0
|
||||
? TEXT.days(days)
|
||||
: `${TEXT.days(days)} ${TEXT.hours(hours)}`;
|
||||
const text = t("presence.days", { count: days });
|
||||
return hours === 0 ? text : `${text} ${t("presence.hours", { hours })}`;
|
||||
}
|
||||
|
||||
function capitalize(text: string): string {
|
||||
return text.charAt(0).toUpperCase() + text.slice(1);
|
||||
}
|
||||
|
||||
export function weekdayLabels(): string[] {
|
||||
const format = new Intl.DateTimeFormat(locale.tag, {
|
||||
timeZone: "UTC",
|
||||
weekday: "short",
|
||||
});
|
||||
return Array.from({ length: DAYS_IN_WEEK }, (_, day) =>
|
||||
capitalize(format.format(MONDAY + day * MS_IN_DAY))
|
||||
);
|
||||
}
|
||||
@@ -1,8 +1,12 @@
|
||||
import type { InlineButton } from "#lib/api/types.js";
|
||||
|
||||
export interface Segment {
|
||||
hit: boolean;
|
||||
text: string;
|
||||
}
|
||||
|
||||
type Range = [number, number];
|
||||
|
||||
const WORD = /[\p{L}\p{N}_]+/gu;
|
||||
const SPACE = /\s/;
|
||||
const PREFIX_MIN = 3;
|
||||
@@ -20,39 +24,92 @@ function matches(word: string, terms: string[]): boolean {
|
||||
);
|
||||
}
|
||||
|
||||
function windowed(text: string, terms: string[]): string {
|
||||
for (const match of text.matchAll(WORD)) {
|
||||
if (!matches(match[0], terms)) {
|
||||
continue;
|
||||
}
|
||||
if (match.index <= REACH) {
|
||||
return text;
|
||||
}
|
||||
let start = match.index - LEAD;
|
||||
while (start > 0 && !SPACE.test(text[start - 1])) {
|
||||
start -= 1;
|
||||
}
|
||||
return `…${text.slice(start)}`;
|
||||
}
|
||||
return text;
|
||||
function wordRanges(text: string, terms: string[]): Range[] {
|
||||
return [...text.matchAll(WORD)]
|
||||
.filter((match) => matches(match[0], terms))
|
||||
.map((match) => [match.index, match.index + match[0].length]);
|
||||
}
|
||||
|
||||
export function highlight(text: string, terms: string[]): Segment[] {
|
||||
const shown = windowed(text, terms);
|
||||
const segments: Segment[] = [];
|
||||
let last = 0;
|
||||
for (const match of shown.matchAll(WORD)) {
|
||||
if (!matches(match[0], terms)) {
|
||||
function markRanges(text: string, marks: string[]): Range[] {
|
||||
const folded = fold(text);
|
||||
if (folded.length !== text.length) {
|
||||
return [];
|
||||
}
|
||||
const ranges: Range[] = [];
|
||||
for (const mark of marks.map(fold)) {
|
||||
if (mark.length < PREFIX_MIN) {
|
||||
ranges.push(...wordRanges(text, [mark]));
|
||||
continue;
|
||||
}
|
||||
if (match.index > last) {
|
||||
segments.push({ hit: false, text: shown.slice(last, match.index) });
|
||||
for (let at = folded.indexOf(mark); at !== -1; ) {
|
||||
ranges.push([at, at + mark.length]);
|
||||
at = folded.indexOf(mark, at + mark.length);
|
||||
}
|
||||
segments.push({ hit: true, text: match[0] });
|
||||
last = match.index + match[0].length;
|
||||
}
|
||||
if (last < shown.length) {
|
||||
segments.push({ hit: false, text: shown.slice(last) });
|
||||
ranges.sort((a, b) => a[0] - b[0]);
|
||||
const merged: Range[] = [];
|
||||
for (const [start, end] of ranges) {
|
||||
const last = merged.at(-1);
|
||||
if (last && start <= last[1]) {
|
||||
last[1] = Math.max(last[1], end);
|
||||
} else {
|
||||
merged.push([start, end]);
|
||||
}
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
function split(text: string, ranges: Range[]): Segment[] {
|
||||
const segments: Segment[] = [];
|
||||
let last = 0;
|
||||
for (const [start, end] of ranges) {
|
||||
if (start > last) {
|
||||
segments.push({ hit: false, text: text.slice(last, start) });
|
||||
}
|
||||
segments.push({ hit: true, text: text.slice(start, end) });
|
||||
last = end;
|
||||
}
|
||||
if (last < text.length) {
|
||||
segments.push({ hit: false, text: text.slice(last) });
|
||||
}
|
||||
return segments;
|
||||
}
|
||||
|
||||
function windowed(text: string, ranges: Range[]): Segment[] {
|
||||
const first = ranges[0]?.[0];
|
||||
if (first === undefined || first <= REACH) {
|
||||
return split(text, ranges);
|
||||
}
|
||||
const cut = first - LEAD;
|
||||
let start = cut;
|
||||
while (start > 0 && !SPACE.test(text[start - 1])) {
|
||||
start -= 1;
|
||||
}
|
||||
if (start === 0) {
|
||||
start = cut;
|
||||
}
|
||||
const shifted = ranges.map(([a, b]): Range => [a - start, b - start]);
|
||||
return [{ hit: false, text: "…" }, ...split(text.slice(start), shifted)];
|
||||
}
|
||||
|
||||
export function highlight(text: string, terms: string[]): Segment[] {
|
||||
return windowed(text, wordRanges(text, terms));
|
||||
}
|
||||
|
||||
export function highlightMarks(text: string, marks: string[]): Segment[] {
|
||||
return windowed(text, markRanges(text, marks));
|
||||
}
|
||||
|
||||
export function markText(text: string, marks: string[]): Segment[] {
|
||||
return split(text, markRanges(text, marks));
|
||||
}
|
||||
|
||||
export function hasMark(text: string | null, marks: string[]): boolean {
|
||||
return text !== null && markRanges(text, marks).length > 0;
|
||||
}
|
||||
|
||||
export function buttonHasMark(button: InlineButton, marks: string[]): boolean {
|
||||
return [button.text, button.data, button.url].some((value) =>
|
||||
hasMark(value, marks)
|
||||
);
|
||||
}
|
||||
@@ -2,30 +2,6 @@ import type { FileShare } from "#lib/api/types.js";
|
||||
import { formatFull } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
const TEEN_START = 11;
|
||||
const TEEN_END = 14;
|
||||
const FEW_END = 4;
|
||||
|
||||
export function plural(
|
||||
count: number,
|
||||
one: string,
|
||||
few: string,
|
||||
many: string
|
||||
): string {
|
||||
const tail = count % 100;
|
||||
if (tail >= TEEN_START && tail <= TEEN_END) {
|
||||
return many;
|
||||
}
|
||||
const last = count % 10;
|
||||
if (last === 1) {
|
||||
return one;
|
||||
}
|
||||
if (last >= 2 && last <= FEW_END) {
|
||||
return few;
|
||||
}
|
||||
return many;
|
||||
}
|
||||
|
||||
export function formatDownloads(share: FileShare): string {
|
||||
if (share.max_downloads === null) {
|
||||
return t("shares.downloads", { count: share.download_count });
|
||||
|
||||
@@ -9,6 +9,7 @@ import type {
|
||||
} from "#lib/api/watches.js";
|
||||
import { formatTime } from "#lib/format/datetime.js";
|
||||
import { locale, t } from "#lib/i18n/locale.svelte.js";
|
||||
import { MARK_PARAM } from "#lib/stores/feed.svelte.js";
|
||||
|
||||
export const KIND_ICONS: Record<WatchKind, string> = {
|
||||
keyword: "search",
|
||||
@@ -162,6 +163,32 @@ export function alertTitle(alert: AlertItem): string {
|
||||
return personName(alert.peer);
|
||||
}
|
||||
|
||||
function alertMarks(alert: AlertItem): string[] {
|
||||
const pattern = patternOf(alert.watch.params);
|
||||
if (alert.watch.kind !== "keyword" || !pattern) {
|
||||
return [];
|
||||
}
|
||||
if (!alert.watch.params.regex) {
|
||||
return [pattern];
|
||||
}
|
||||
try {
|
||||
const found = (alert.message?.text ?? "").matchAll(
|
||||
new RegExp(pattern, "gi")
|
||||
);
|
||||
return [...new Set([...found].map((match) => match[0]).filter(Boolean))];
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
export function alertHref(alert: AlertItem): string {
|
||||
const url = new URL(alert.path, "http://app");
|
||||
for (const mark of alertMarks(alert)) {
|
||||
url.searchParams.append(MARK_PARAM, mark);
|
||||
}
|
||||
return `${url.pathname}${url.search}`;
|
||||
}
|
||||
|
||||
export function alertLabel(alert: AlertItem): string {
|
||||
if (alert.watch.name) {
|
||||
return alert.watch.name;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { account } from "#lib/i18n/messages/account.js";
|
||||
import { alerts } from "#lib/i18n/messages/alerts.js";
|
||||
import { bots } from "#lib/i18n/messages/bots.js";
|
||||
import { capture } from "#lib/i18n/messages/capture.js";
|
||||
import { chat } from "#lib/i18n/messages/chat.js";
|
||||
import { common } from "#lib/i18n/messages/common.js";
|
||||
import { feed } from "#lib/i18n/messages/feed.js";
|
||||
import { jobs } from "#lib/i18n/messages/jobs.js";
|
||||
@@ -8,11 +10,15 @@ import { login } from "#lib/i18n/messages/login.js";
|
||||
import { media } from "#lib/i18n/messages/media.js";
|
||||
import { menu } from "#lib/i18n/messages/menu.js";
|
||||
import { notes } from "#lib/i18n/messages/notes.js";
|
||||
import { parts } from "#lib/i18n/messages/parts.js";
|
||||
import { policy } from "#lib/i18n/messages/policy.js";
|
||||
import { presence } from "#lib/i18n/messages/presence.js";
|
||||
import { profile } from "#lib/i18n/messages/profile.js";
|
||||
import { read } from "#lib/i18n/messages/read.js";
|
||||
import { search } from "#lib/i18n/messages/search.js";
|
||||
import { service } from "#lib/i18n/messages/service.js";
|
||||
import { settings } from "#lib/i18n/messages/settings.js";
|
||||
import { shared } from "#lib/i18n/messages/shared.js";
|
||||
import { shares } from "#lib/i18n/messages/shares.js";
|
||||
import { social } from "#lib/i18n/messages/social.js";
|
||||
import { storage } from "#lib/i18n/messages/storage.js";
|
||||
@@ -25,6 +31,8 @@ export const messages = {
|
||||
...account,
|
||||
...alerts,
|
||||
...bots,
|
||||
...capture,
|
||||
...chat,
|
||||
...common,
|
||||
...feed,
|
||||
...jobs,
|
||||
@@ -32,11 +40,15 @@ export const messages = {
|
||||
...media,
|
||||
...menu,
|
||||
...notes,
|
||||
...parts,
|
||||
...policy,
|
||||
...presence,
|
||||
...profile,
|
||||
...read,
|
||||
...search,
|
||||
...service,
|
||||
...settings,
|
||||
...shared,
|
||||
...shares,
|
||||
...social,
|
||||
...storage,
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import type { Messages } from "#lib/i18n/types.js";
|
||||
|
||||
export const capture = {
|
||||
"capture.botNever": {
|
||||
en: "The bot has not connected yet",
|
||||
ru: "Бот ещё не выходил на связь",
|
||||
},
|
||||
"capture.botQuiet": {
|
||||
en: "The bot is silent since {when}",
|
||||
ru: "Бот молчит с {when}",
|
||||
},
|
||||
"capture.live": {
|
||||
en: "Capturing since {when}",
|
||||
ru: "Захват идёт с {when}",
|
||||
},
|
||||
"capture.never": {
|
||||
en: "The userbot has not connected yet",
|
||||
ru: "Юзербот ещё не выходил на связь",
|
||||
},
|
||||
"capture.quiet": {
|
||||
en: "The userbot is silent since {when}",
|
||||
ru: "Юзербот молчит с {when}",
|
||||
},
|
||||
} satisfies Messages;
|
||||
@@ -0,0 +1,56 @@
|
||||
import type { Messages } from "#lib/i18n/types.js";
|
||||
|
||||
export const chat = {
|
||||
"chat.calendar": { en: "Jump to date", ru: "Перейти к дате" },
|
||||
"chat.calendar.count": {
|
||||
en: { one: "{count} message", other: "{count} messages" },
|
||||
ru: {
|
||||
few: "{count} сообщения",
|
||||
many: "{count} сообщений",
|
||||
one: "{count} сообщение",
|
||||
other: "{count} сообщения",
|
||||
},
|
||||
},
|
||||
"chat.calendar.nextMonth": { en: "Next month", ru: "Следующий месяц" },
|
||||
"chat.calendar.nextYear": { en: "Next year", ru: "Следующий год" },
|
||||
"chat.calendar.prevMonth": { en: "Previous month", ru: "Предыдущий месяц" },
|
||||
"chat.calendar.prevYear": { en: "Previous year", ru: "Предыдущий год" },
|
||||
"chat.deletedAt": { en: "deleted {when}", ru: "удалено {when}" },
|
||||
"chat.deletedPreview": { en: "Deleted", ru: "Удалено" },
|
||||
"chat.edited": { en: "edited", ru: "изменено" },
|
||||
"chat.editedAt": { en: "Edited {when}", ru: "Изменено {when}" },
|
||||
"chat.gap": { en: "archive was off {range}", ru: "архив не писал {range}" },
|
||||
"chat.media.download": { en: "Download {kind}", ru: "Скачать: {kind}" },
|
||||
"chat.media.downloadFailed": {
|
||||
en: "Could not download the file",
|
||||
ru: "Не удалось скачать файл",
|
||||
},
|
||||
"chat.media.file": { en: "File", ru: "Файл" },
|
||||
"chat.media.fullscreen": {
|
||||
en: "Open full screen",
|
||||
ru: "Открыть на весь экран",
|
||||
},
|
||||
"chat.media.photo": { en: "Photo", ru: "Фото" },
|
||||
"chat.media.queue": { en: "Download to archive", ru: "Скачать в архив" },
|
||||
"chat.media.queued": { en: "Queued", ru: "В очереди" },
|
||||
"chat.media.queueFailed": {
|
||||
en: "Could not queue the download",
|
||||
ru: "Не удалось поставить в очередь",
|
||||
},
|
||||
"chat.media.save": { en: "Download file", ru: "Скачать файл" },
|
||||
"chat.media.selfDestruct": {
|
||||
en: "Self-destructing media",
|
||||
ru: "Самоуничтожающееся медиа",
|
||||
},
|
||||
"chat.media.share": { en: "Share by link", ru: "Доступ по ссылке" },
|
||||
"chat.media.tapToDownload": {
|
||||
en: "Tap to download",
|
||||
ru: "Нажмите, чтобы скачать",
|
||||
},
|
||||
"chat.media.versions": { en: "Media versions", ru: "Версии медиа" },
|
||||
"chat.media.video": { en: "Video", ru: "Видео" },
|
||||
"chat.menu.copied": { en: "Copied", ru: "Скопировано" },
|
||||
"chat.menu.copyLink": { en: "Copy link", ru: "Копировать ссылку" },
|
||||
"chat.menu.linkCopied": { en: "Link copied", ru: "Ссылка скопирована" },
|
||||
"chat.note": { en: "Note", ru: "Заметка" },
|
||||
} satisfies Messages;
|
||||
@@ -59,6 +59,7 @@ export const feed = {
|
||||
},
|
||||
},
|
||||
"feed.changes": { en: "Changes", ru: "Изменения" },
|
||||
"feed.chats.bot": { en: "Bots", ru: "Боты" },
|
||||
"feed.chats.channel": { en: "Channels", ru: "Каналы" },
|
||||
"feed.chats.dm": { en: "Private", ru: "Личка" },
|
||||
"feed.chats.group": { en: "Groups", ru: "Группы" },
|
||||
@@ -92,6 +93,7 @@ export const feed = {
|
||||
"feed.filter.deleted": { en: "Deleted", ru: "Удалённые" },
|
||||
"feed.filter.edited": { en: "Edited", ru: "Изменённые" },
|
||||
"feed.filter.profile": { en: "Profiles", ru: "Профили" },
|
||||
"feed.folder": { en: "Folder feed", ru: "Лента папки" },
|
||||
"feed.lostText": {
|
||||
en: "The earlier text wasn't saved",
|
||||
ru: "Прежний текст не сохранился",
|
||||
|
||||
@@ -10,10 +10,6 @@ export const jobs = {
|
||||
en: "A full backfill rereads the whole chat history from the very beginning. The button in the chat header only loads messages newer than the last saved one.",
|
||||
ru: "Полный бэкфилл перечитывает всю историю чата с самого начала. Кнопка в шапке чата догружает только сообщения новее последнего сохранённого.",
|
||||
},
|
||||
"jobs.backfillStarted": {
|
||||
en: "Full backfill started",
|
||||
ru: "Полный бэкфилл запущен",
|
||||
},
|
||||
"jobs.chat": { en: "chat {id}", ru: "чат {id}" },
|
||||
"jobs.contactsFailed": {
|
||||
en: "Could not sync contacts",
|
||||
@@ -23,10 +19,6 @@ export const jobs = {
|
||||
en: "Contacts are synced separately, then search finds people you haven't chatted with yet.",
|
||||
ru: "Контакты подтягиваются отдельно, тогда в поиске появятся люди, с которыми ещё не было переписки.",
|
||||
},
|
||||
"jobs.contactsStarted": {
|
||||
en: "Contact sync started",
|
||||
ru: "Синхронизация контактов запущена",
|
||||
},
|
||||
"jobs.dialogs": { en: "Chats", ru: "Диалоги" },
|
||||
"jobs.dialogsHint": {
|
||||
en: "Sync pulls in every chat of the account, so old chats show up and can be backfilled.",
|
||||
@@ -76,9 +68,5 @@ export const jobs = {
|
||||
en: "Could not sync chats",
|
||||
ru: "Не удалось синхронизировать диалоги",
|
||||
},
|
||||
"jobs.syncStarted": {
|
||||
en: "Chat sync started",
|
||||
ru: "Синхронизация диалогов запущена",
|
||||
},
|
||||
"jobs.title": { en: "Jobs", ru: "Задачи" },
|
||||
} satisfies Messages;
|
||||
@@ -1,7 +1,6 @@
|
||||
import type { Messages } from "#lib/i18n/types.js";
|
||||
|
||||
export const login = {
|
||||
"login.added": { en: "Account added", ru: "Аккаунт добавлен" },
|
||||
"login.byPhone": {
|
||||
en: "Log in by phone number",
|
||||
ru: "Войти по номеру телефона",
|
||||
|
||||
Loaded 100 of 123 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user