From 5f7013fb81f15b7f5e869a63bb7b822c10d272e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6pf?= Date: Thu, 2 Feb 2023 00:51:20 +0100 Subject: [PATCH] add '_' prefix to special emoji codes, fix skip rankings --- backend/oasst_backend/tree_manager.py | 2 +- oasst-shared/oasst_shared/schemas/protocol.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/oasst_backend/tree_manager.py b/backend/oasst_backend/tree_manager.py index 672c9081..e09f22d1 100644 --- a/backend/oasst_backend/tree_manager.py +++ b/backend/oasst_backend/tree_manager.py @@ -967,7 +967,7 @@ SELECT m.parent_id, m.role, COUNT(m.id) children_count, MIN(m.ranking_count) chi FROM message_tree_state mts INNER JOIN message m ON mts.message_tree_id = m.message_tree_id LEFT JOIN message_emoji me on - (m.id = me.message_id + (m.parent_id = me.message_id AND :skip_user_id IS NOT NULL AND me.user_id = :skip_user_id AND me.emoji = :skip_ranking) diff --git a/oasst-shared/oasst_shared/schemas/protocol.py b/oasst-shared/oasst_shared/schemas/protocol.py index 6bd95dc5..3570d3fd 100644 --- a/oasst-shared/oasst_shared/schemas/protocol.py +++ b/oasst-shared/oasst_shared/schemas/protocol.py @@ -490,9 +490,9 @@ class EmojiCode(str, enum.Enum): skull = "skull" # 💀 # skip task system uses special emoji codes - skip_reply = "skip_reply" - skip_ranking = "skip_ranking" - skip_labeling = "skip_labeling" + skip_reply = "_skip_reply" + skip_ranking = "_skip_ranking" + skip_labeling = "_skip_labeling" class EmojiOp(str, enum.Enum):