Skip to content

Commit

Permalink
fix_: revert previous commit
Browse files Browse the repository at this point in the history 
This reverts commit b2c2e40.
  • Loading branch information
@qfrank
qfrank committed Sep 19, 2024
1 parent b6a3a19 commit 3f8962b
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 44 deletions.
26 changes: 12 additions & 14 deletions protocol/messenger_mention.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ type ChatMentionContext struct {
NewText string

CallID uint64
CallTime int64
mu *sync.Mutex
LatestCallID uint64
}
Expand Down Expand Up @@ -302,28 +301,27 @@ func (m *MentionManager) ReplaceWithPublicKey(chatID, text string) (string, erro
return newText, nil
}

func withCallID(ctx *ChatMentionContext, callID uint64, callTime int64) *ChatMentionContext {
func withCallID(ctx *ChatMentionContext, callID uint64) *ChatMentionContext {
result := *ctx
result.CallID = callID
result.CallTime = callTime
return &result
}

func (m *MentionManager) OnChangeText(chatID, fullText string, callID uint64, callTime int64) (*ChatMentionContext, error) {
func (m *MentionManager) OnChangeText(chatID, fullText string, callID uint64) (*ChatMentionContext, error) {
ctx := m.getChatMentionContext(chatID)
if callID > 0 {
ctx.mu.Lock()
if callID <= ctx.LatestCallID {
ctx.mu.Unlock()
return withCallID(ctx, callID, callTime), fmt.Errorf("callID is less than or equal to latestCallID, callID: %d, maxCallID: %d", callID, ctx.LatestCallID)
return withCallID(ctx, callID), fmt.Errorf("callID is less than or equal to latestCallID, callID: %d, maxCallID: %d", callID, ctx.LatestCallID)
}
ctx.LatestCallID = callID
ctx.mu.Unlock()
}

diff := diffText(ctx.PreviousText, fullText)
if diff == nil {
return withCallID(ctx, callID, callTime), nil
return withCallID(ctx, callID), nil
}
ctx.PreviousText = fullText
if ctx.MentionState == nil {
Expand All @@ -337,12 +335,12 @@ func (m *MentionManager) OnChangeText(chatID, fullText string, callID uint64, ca

atIndexes, err := calculateAtIndexEntries(ctx.MentionState)
if err != nil {
return withCallID(ctx, callID, callTime), err
return withCallID(ctx, callID), err
}
ctx.MentionState.AtIdxs = atIndexes
m.logger.Debug("OnChangeText", zap.String("chatID", chatID), zap.Any("state", ctx.MentionState))
ctx, err = m.calculateSuggestions(chatID, fullText)
return withCallID(ctx, callID, callTime), err
return withCallID(ctx, callID), err
}

func (m *MentionManager) calculateSuggestions(chatID, fullText string) (*ChatMentionContext, error) {
Expand Down Expand Up @@ -374,8 +372,8 @@ func (m *MentionManager) calculateSuggestionsWithMentionableUsers(chatID string,
}

newAtIndexEntries := checkIdxForMentions(fullText, state.AtIdxs, mentionableUsers)
calculatedInput, inputSegmentString := calculateInput(fullText, newAtIndexEntries)
if fullText != inputSegmentString {
calculatedInput, success := calculateInput(fullText, newAtIndexEntries)
if !success {
m.logger.Warn("calculateSuggestionsWithMentionableUsers: calculateInput failed", zap.String("chatID", chatID), zap.String("fullText", fullText), zap.Any("state", state))
}

Expand Down Expand Up @@ -428,7 +426,7 @@ func (m *MentionManager) SelectMention(chatID, text, primaryName, publicKey stri

ctx.NewText = string(tr[:atSignIdx+1]) + primaryName + space + string(tr[mentionEnd:])

_, err := m.OnChangeText(chatID, ctx.NewText, 0, 0)
_, err := m.OnChangeText(chatID, ctx.NewText, 0)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1015,9 +1013,9 @@ func appendInputSegment(result *[]InputSegment, typ SegmentType, value string, f
}
}

func calculateInput(text string, atIndexEntries []*AtIndexEntry) ([]InputSegment, string) {
func calculateInput(text string, atIndexEntries []*AtIndexEntry) ([]InputSegment, bool) {
if len(atIndexEntries) == 0 {
return []InputSegment{{Type: Text, Value: text}}, text
return []InputSegment{{Type: Text, Value: text}}, true
}
idxCount := len(atIndexEntries)
lastFrom := atIndexEntries[idxCount-1].From
Expand Down Expand Up @@ -1053,7 +1051,7 @@ func calculateInput(text string, atIndexEntries []*AtIndexEntry) ([]InputSegment
}
}

return result, fullText
return result, fullText == text
}

func subs(s string, start int, end ...int) string {
Expand Down
49 changes: 21 additions & 28 deletions protocol/messenger_mention_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"reflect"
"strings"
"testing"
"time"

"github.com/stretchr/testify/require"

Expand Down Expand Up @@ -795,7 +794,7 @@ func TestMentionSuggestionCases(t *testing.T) {

for i, tc := range testCases {
t.Run(fmt.Sprintf("%d", i+1), func(t *testing.T) {
ctx, err := mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1), now())
ctx, err := mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1))
require.NoError(t, err)
t.Logf("Input: %+v, MentionState:%+v, InputSegments:%+v\n", tc.inputText, ctx.MentionState, ctx.InputSegments)
require.Equal(t, tc.expectedSize, len(ctx.MentionSuggestions))
Expand All @@ -807,7 +806,7 @@ func TestMentionSuggestionAfterToInputField(t *testing.T) {
mentionableUserMap, chatID, mentionManager := setupMentionSuggestionTest(t, nil)
_, err := mentionManager.ToInputField(chatID, "abc")
require.NoError(t, err)
ctx, err := mentionManager.OnChangeText(chatID, "@", 1, now())
ctx, err := mentionManager.OnChangeText(chatID, "@", 1)
require.NoError(t, err)
require.Equal(t, len(mentionableUserMap), len(ctx.MentionSuggestions))
}
Expand All @@ -827,7 +826,7 @@ func TestMentionSuggestionSpecialInputModeForAndroid(t *testing.T) {

for i, tc := range testCases {
t.Run(fmt.Sprintf("%d", i+1), func(t *testing.T) {
ctx, err := mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1), now())
ctx, err := mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1))
require.NoError(t, err)
require.Equal(t, tc.expectedSize, len(ctx.MentionSuggestions))
t.Logf("Input: %+v, MentionState:%+v, InputSegments:%+v\n", tc.inputText, ctx.MentionState, ctx.InputSegments)
Expand All @@ -850,7 +849,7 @@ func TestMentionSuggestionSpecialChars(t *testing.T) {

for i, tc := range testCases {
t.Run(fmt.Sprintf("%d", i+1), func(t *testing.T) {
ctx, err := mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1), now())
ctx, err := mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1))
require.NoError(t, err)
t.Logf("Input: %+v, MentionState:%+v, InputSegments:%+v\n", tc.inputText, ctx.MentionState, ctx.InputSegments)
require.Equal(t, tc.expectedSize, len(ctx.MentionSuggestions))
Expand Down Expand Up @@ -880,7 +879,7 @@ func TestMentionSuggestionAtSignSpaceCases(t *testing.T) {
var ctx *ChatMentionContext
var err error
for i, tc := range testCases {
ctx, err = mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1), now())
ctx, err = mentionManager.OnChangeText(chatID, tc.inputText, uint64(i+1))
require.NoError(t, err)
t.Logf("After OnChangeText, Input: %+v, MentionState:%+v, InputSegments:%+v\n", tc.inputText, ctx.MentionState, ctx.InputSegments)
require.Equal(t, tc.expectedSize, len(ctx.MentionSuggestions))
Expand All @@ -897,12 +896,12 @@ func TestSelectMention(t *testing.T) {

var callID uint64 = 1
text := "@u2 abc"
ctx, err := mentionManager.OnChangeText(chatID, text, callID, now())
ctx, err := mentionManager.OnChangeText(chatID, text, callID)
require.NoError(t, err)
require.Equal(t, 0, len(ctx.MentionSuggestions))

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u abc", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u abc", callID)
require.NoError(t, err)
require.Equal(t, len(mentionableUsers), len(ctx.MentionSuggestions))

Expand All @@ -913,26 +912,22 @@ func TestSelectMention(t *testing.T) {
require.Equal(t, text, ctx.PreviousText)

callID++
ctx, err = mentionManager.OnChangeText(chatID, text, callID, now())
ctx, err = mentionManager.OnChangeText(chatID, text, callID)
require.NoError(t, err)
require.Equal(t, 0, len(ctx.MentionSuggestions))
}

func now() int64 {
return time.Now().UnixMilli()
}

func TestInputSegments(t *testing.T) {
_, chatID, mentionManager := setupMentionSuggestionTest(t, nil)
var callID uint64 = 1
ctx, err := mentionManager.OnChangeText(chatID, "@u1", callID, now())
ctx, err := mentionManager.OnChangeText(chatID, "@u1", callID)
require.NoError(t, err)
require.Equal(t, 1, len(ctx.InputSegments))
require.Equal(t, Text, ctx.InputSegments[0].Type)
require.Equal(t, "@u1", ctx.InputSegments[0].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u1 @User Number One", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u1 @User Number One", callID)
require.NoError(t, err)
require.Equal(t, 2, len(ctx.InputSegments))
require.Equal(t, Text, ctx.InputSegments[0].Type)
Expand All @@ -941,14 +936,14 @@ func TestInputSegments(t *testing.T) {
require.Equal(t, "@User Number One", ctx.InputSegments[1].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u1 @User Number O", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u1 @User Number O", callID)
require.NoError(t, err)
require.Equal(t, 2, len(ctx.InputSegments))
require.Equal(t, Text, ctx.InputSegments[1].Type)
require.Equal(t, "@User Number O", ctx.InputSegments[1].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u2 @User Number One", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u2 @User Number One", callID)
require.NoError(t, err)
require.Equal(t, 3, len(ctx.InputSegments))
require.Equal(t, Mention, ctx.InputSegments[0].Type)
Expand All @@ -959,7 +954,7 @@ func TestInputSegments(t *testing.T) {
require.Equal(t, "@User Number One", ctx.InputSegments[2].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u2 @User Number One a ", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u2 @User Number One a ", callID)
require.NoError(t, err)
require.Equal(t, 4, len(ctx.InputSegments))
require.Equal(t, Mention, ctx.InputSegments[2].Type)
Expand All @@ -968,7 +963,7 @@ func TestInputSegments(t *testing.T) {
require.Equal(t, " a ", ctx.InputSegments[3].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u2 @User Numbed One a ", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u2 @User Numbed One a ", callID)
require.NoError(t, err)
require.Equal(t, 3, len(ctx.InputSegments))
require.Equal(t, Mention, ctx.InputSegments[0].Type)
Expand All @@ -977,7 +972,7 @@ func TestInputSegments(t *testing.T) {
require.Equal(t, "@User Numbed One a ", ctx.InputSegments[2].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@ @ ", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@ @ ", callID)
require.NoError(t, err)
require.Equal(t, 2, len(ctx.InputSegments))
require.Equal(t, Text, ctx.InputSegments[0].Type)
Expand All @@ -986,7 +981,7 @@ func TestInputSegments(t *testing.T) {
require.Equal(t, "@ ", ctx.InputSegments[1].Value)

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@u3 @ ", callID, now())
ctx, err = mentionManager.OnChangeText(chatID, "@u3 @ ", callID)
require.NoError(t, err)
require.Equal(t, 3, len(ctx.InputSegments))
require.Equal(t, Mention, ctx.InputSegments[0].Type)
Expand All @@ -997,26 +992,24 @@ func TestInputSegments(t *testing.T) {
require.Equal(t, "@ ", ctx.InputSegments[2].Value)

callID++
_, err = mentionManager.OnChangeText(chatID, " @ @User Number Three ", callID, now())
_, err = mentionManager.OnChangeText(chatID, " @ @User Number Three ", callID)
require.NoError(t, err)
callID++
_, err = mentionManager.OnChangeText(chatID, "@U @ @User Number Three ", callID, now())
_, err = mentionManager.OnChangeText(chatID, "@U @ @User Number Three ", callID)
require.NoError(t, err)
ctx, err = mentionManager.SelectMention(chatID, "@U @ @User Number Three ", "User Number Three", "0xpk3")
require.NoError(t, err)
require.Equal(t, 2, mentionTypeNum(ctx.InputSegments))

callID++
ctx, _ = mentionManager.OnChangeText(chatID, "@User Number Threea", callID, now())
ctx, _ = mentionManager.OnChangeText(chatID, "@User Number Threea", callID)
require.Equal(t, 0, mentionTypeNum(ctx.InputSegments))

callID++
ctx, err = mentionManager.OnChangeText(chatID, "@User Number Threea\n@u2\nabc@u3 asa", callID, now())
require.NoError(t, err)
ctx, _ = mentionManager.OnChangeText(chatID, "@User Number Threea\n@u2\nabc@u3 asa", callID)
require.Equal(t, 2, mentionTypeNum(ctx.InputSegments))
callID++
ctx, err = mentionManager.OnChangeText(chatID, "@User Number Thre\n@u2\nabc@u3 asa", callID, now())
require.NoError(t, err)
ctx, _ = mentionManager.OnChangeText(chatID, "@User Number Thre\n@u2\nabc@u3 asa", callID)
require.Equal(t, 2, mentionTypeNum(ctx.InputSegments))
require.Equal(t, "@u2", ctx.InputSegments[1].Value)
require.Equal(t, "@u3", ctx.InputSegments[3].Value)
Expand Down
4 changes: 2 additions & 2 deletions services/ext/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1705,8 +1705,8 @@ func (api *PublicAPI) ChatMentionReplaceWithPublicKey(chatID, text string) (stri
// 2. user input "c", call this function with text "abc"
// whatever, we should ensure ChatMentionOnChangeText know(invoked) the latest full text.
// ChatMentionOnChangeText will maintain state of fulltext and diff between previous/latest full text internally.
func (api *PublicAPI) ChatMentionOnChangeText(chatID, text string, callID uint64, callTime int64) (*protocol.ChatMentionContext, error) {
return api.service.messenger.GetMentionsManager().OnChangeText(chatID, text, callID, callTime)
func (api *PublicAPI) ChatMentionOnChangeText(chatID, text string, callID uint64) (*protocol.ChatMentionContext, error) {
return api.service.messenger.GetMentionsManager().OnChangeText(chatID, text, callID)
}

// ChatMentionSelectMention select mention from mention suggestion list
Expand Down

0 comments on commit 3f8962b

Please sign in to comment.