Merge remote-tracking branch 'upstream/main' into merge-gramsrv-9106877

2026-08-03 23:29:20 +03:00 · 2026-08-03 23:29:20 +03:00 · ac6a50c5ff
commit ac6a50c5ff
parent 030f859ba3 9106877123
697 changed files with 100880 additions and 8052 deletions
--- a/internal/store/postgres/queries/dialog.sql
+++ b/internal/store/postgres/queries/dialog.sql
@ -880,30 +880,6 @@ WHERE d.user_id = sqlc.arg(user_id)::bigint
  AND d.peer_type = sqlc.arg(peer_type)::text
  AND d.peer_id = sqlc.arg(peer_id)::bigint;

-- name: ClearDialogAfterHistoryDelete :exec
-UPDATE dialogs d
-SET
-  top_message_id = 0,
-  top_message_date = 0,
-  read_inbox_max_id = GREATEST(d.read_inbox_max_id, d.top_message_id),
-  read_outbox_max_id = GREATEST(d.read_outbox_max_id, d.top_message_id),
-  unread_count = 0,
-  unread_mark = false,
-  unread_mentions_count = 0,
-  unread_reactions_count = (
-    SELECT COUNT(*)::int
-    FROM message_boxes m2
-    WHERE m2.owner_user_id = d.user_id
-      AND m2.peer_type = d.peer_type
-      AND m2.peer_id = d.peer_id
-      AND NOT m2.deleted
-      AND m2.reaction_unread
-  ),
-  updated_at = now()
-WHERE d.user_id = sqlc.arg(user_id)::bigint
-  AND d.peer_type = sqlc.arg(peer_type)::text
-  AND d.peer_id = sqlc.arg(peer_id)::bigint;
-
 -- name: DeleteDialogByPeer :exec
 WITH dropped_drafts AS (
    -- 删除会话同时丢弃该 peer 的云草稿，避免对端重建会话后旧草稿复活。
--- a/internal/store/postgres/queries/message.sql
+++ b/internal/store/postgres/queries/message.sql
@ -545,6 +545,8 @@ base AS NOT MATERIALIZED (
      sqlc.arg(query)::text = ''
      OR m.body ILIKE ('%' || sqlc.arg(query)::text || '%')
    )
+    AND (sqlc.arg(min_date)::int <= 0 OR m.message_date > sqlc.arg(min_date)::int)
+    AND (sqlc.arg(max_date)::int <= 0 OR m.message_date < sqlc.arg(max_date)::int)
    AND (sqlc.arg(max_id)::int <= 0 OR m.box_id < sqlc.arg(max_id)::int)
    AND (sqlc.arg(min_id)::int <= 0 OR m.box_id > sqlc.arg(min_id)::int)
    AND (NOT sqlc.arg(pinned_only)::boolean OR m.pinned)
@ -564,6 +566,17 @@ base AS NOT MATERIALIZED (
      sqlc.arg(saved_peer_type)::text = ''
      OR (m.saved_peer_type = sqlc.arg(saved_peer_type)::text AND m.saved_peer_id = sqlc.arg(saved_peer_id)::bigint)
    )
+    AND (
+      cardinality(sqlc.arg(saved_reaction_keys)::text[]) = 0
+      OR EXISTS (
+        SELECT 1
+        FROM saved_message_reaction_tags tag
+        WHERE tag.user_id = m.owner_user_id
+          AND tag.message_box_id = m.box_id
+          AND (tag.reaction_type || ':' || tag.reaction_value)
+              = ANY(sqlc.arg(saved_reaction_keys)::text[])
+      )
+    )
 ),
 total AS (
  SELECT count(*)::int AS total_count
@ -810,6 +823,8 @@ WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint
    sqlc.arg(query)::text = ''
    OR m.body ILIKE ('%' || sqlc.arg(query)::text || '%')
  )
+  AND (sqlc.arg(min_date)::int <= 0 OR m.message_date > sqlc.arg(min_date)::int)
+  AND (sqlc.arg(max_date)::int <= 0 OR m.message_date < sqlc.arg(max_date)::int)
  AND (sqlc.arg(max_id)::int <= 0 OR m.box_id < sqlc.arg(max_id)::int)
  AND (sqlc.arg(min_id)::int <= 0 OR m.box_id > sqlc.arg(min_id)::int)
  AND (NOT sqlc.arg(pinned_only)::boolean OR m.pinned)
@ -829,6 +844,17 @@ WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint
    sqlc.arg(saved_peer_type)::text = ''
    OR (m.saved_peer_type = sqlc.arg(saved_peer_type)::text AND m.saved_peer_id = sqlc.arg(saved_peer_id)::bigint)
  )
+  AND (
+    cardinality(sqlc.arg(saved_reaction_keys)::text[]) = 0
+    OR EXISTS (
+      SELECT 1
+      FROM saved_message_reaction_tags tag
+      WHERE tag.user_id = m.owner_user_id
+        AND tag.message_box_id = m.box_id
+        AND (tag.reaction_type || ':' || tag.reaction_value)
+            = ANY(sqlc.arg(saved_reaction_keys)::text[])
+    )
+  )
  AND (
    (sqlc.arg(offset_date)::int > 0 AND m.message_date < sqlc.arg(offset_date)::int)
    OR (sqlc.arg(offset_date)::int <= 0 AND (sqlc.arg(offset_id)::int <= 0 OR m.box_id < sqlc.arg(offset_id)::int))
@ -856,6 +882,8 @@ WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint
    sqlc.arg(query)::text = ''
    OR m.body ILIKE ('%' || sqlc.arg(query)::text || '%')
  )
+  AND (sqlc.arg(min_date)::int <= 0 OR m.message_date > sqlc.arg(min_date)::int)
+  AND (sqlc.arg(max_date)::int <= 0 OR m.message_date < sqlc.arg(max_date)::int)
  AND (sqlc.arg(max_id)::int <= 0 OR m.box_id < sqlc.arg(max_id)::int)
  AND (sqlc.arg(min_id)::int <= 0 OR m.box_id > sqlc.arg(min_id)::int)
  AND (NOT sqlc.arg(pinned_only)::boolean OR m.pinned)
@ -874,6 +902,17 @@ WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint
  AND (
    sqlc.arg(saved_peer_type)::text = ''
    OR (m.saved_peer_type = sqlc.arg(saved_peer_type)::text AND m.saved_peer_id = sqlc.arg(saved_peer_id)::bigint)
+  )
+  AND (
+    cardinality(sqlc.arg(saved_reaction_keys)::text[]) = 0
+    OR EXISTS (
+      SELECT 1
+      FROM saved_message_reaction_tags tag
+      WHERE tag.user_id = m.owner_user_id
+        AND tag.message_box_id = m.box_id
+        AND (tag.reaction_type || ':' || tag.reaction_value)
+            = ANY(sqlc.arg(saved_reaction_keys)::text[])
+    )
  );

 -- name: GetMessageBoxesByIDs :many
@ -1304,6 +1343,7 @@ WITH target AS (
  WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint
    AND m.peer_type = sqlc.arg(peer_type)::text
    AND m.peer_id = sqlc.arg(peer_id)::bigint
+    AND (sqlc.arg(keep_box_id)::int <= 0 OR m.box_id <> sqlc.arg(keep_box_id)::int)
    AND (sqlc.arg(max_id)::int <= 0 OR m.box_id <= sqlc.arg(max_id)::int)
    AND (sqlc.arg(min_date)::int <= 0 OR m.message_date >= sqlc.arg(min_date)::int)
    AND (sqlc.arg(max_date)::int <= 0 OR m.message_date <= sqlc.arg(max_date)::int)
@ -1343,6 +1383,7 @@ SELECT EXISTS (
  WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint
    AND m.peer_type = sqlc.arg(peer_type)::text
    AND m.peer_id = sqlc.arg(peer_id)::bigint
+    AND (sqlc.arg(keep_box_id)::int <= 0 OR m.box_id <> sqlc.arg(keep_box_id)::int)
    AND (sqlc.arg(max_id)::int <= 0 OR m.box_id <= sqlc.arg(max_id)::int)
    AND (sqlc.arg(min_date)::int <= 0 OR m.message_date >= sqlc.arg(min_date)::int)
    AND (sqlc.arg(max_date)::int <= 0 OR m.message_date <= sqlc.arg(max_date)::int)
--- a/internal/store/postgres/queries/user.sql
+++ b/internal/store/postgres/queries/user.sql
@ -23,7 +23,18 @@ ORDER BY id;
 SELECT * FROM users WHERE lower(username) = lower($1) AND username <> '' AND deleted_at IS NULL;

 -- name: SearchUsers :many
-WITH matched AS (
+WITH username_matches AS (
+  SELECT
+    peer_id,
+    bool_or(username_lower = sqlc.arg(query_lower)::text) AS exact
+  FROM peer_usernames
+  WHERE peer_type = 'user'
+    AND active
+    AND collectible_id IS NOT NULL
+    AND username_lower LIKE sqlc.arg(query_like)::text || '%' ESCAPE '\'
+  GROUP BY peer_id
+),
+matched AS (
  SELECT
    u.id,
    u.access_hash,
@ -54,7 +65,7 @@ WITH matched AS (
    COALESCE(c.mutual, false)::boolean AS mutual,
    CASE
      WHEN sqlc.arg(phone_query)::text <> '' AND u.phone = sqlc.arg(phone_query)::text THEN 0
-      WHEN lower(u.username) = sqlc.arg(query_lower)::text THEN 1
+      WHEN COALESCE(um.exact, false) OR lower(u.username) = sqlc.arg(query_lower)::text THEN 1
      WHEN lower(COALESCE(NULLIF(c.contact_first_name, ''), u.first_name)) = sqlc.arg(query_lower)::text THEN 2
      WHEN lower(u.first_name) = sqlc.arg(query_lower)::text THEN 3
      WHEN c.contact_user_id IS NOT NULL THEN 4
@ -62,11 +73,13 @@ WITH matched AS (
    END AS rank
  FROM users u
  LEFT JOIN contacts c ON c.user_id = sqlc.arg(current_user_id)::bigint AND c.contact_user_id = u.id
+  LEFT JOIN username_matches um ON um.peer_id = u.id
  WHERE u.id <> sqlc.arg(current_user_id)::bigint
    AND u.deleted_at IS NULL
    AND sqlc.arg(query_lower)::text <> ''
    AND (
      (sqlc.arg(phone_query)::text <> '' AND u.phone LIKE sqlc.arg(phone_query)::text || '%')
+      OR um.peer_id IS NOT NULL
      OR lower(u.username) LIKE sqlc.arg(query_like)::text || '%' ESCAPE '\'
      OR lower(u.first_name) LIKE '%' || sqlc.arg(query_like)::text || '%' ESCAPE '\'
      OR lower(u.last_name) LIKE '%' || sqlc.arg(query_like)::text || '%' ESCAPE '\'