mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Depublishing some app layer methods (#29559)

Просмотр исходного кода 
* Depublishing some app layer methods

* Fixing errors

* Addressing PR review comment

* Using goimports formatting now
Этот коммит содержится в:
Jesús Espino
2024-12-12 20:15:38 +01:00
коммит произвёл GitHub
родитель c19e0ea0e7
Коммит 31351a48b0
17 изменённых файлов: 136 добавлений и 150 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

70
server/channels/app/mention_keywords_test.go
Просмотреть файл

@@ -15,13 +15,13 @@ func mapsToMentionKeywords(userKeywords map[string][]string, groups map[string]*
for keyword, ids := range userKeywords {
for _, id := range ids {
keywords[keyword] = append(keywords[keyword], MentionableUserID(id))
keywords[keyword] = append(keywords[keyword], mentionableUserID(id))
}
}
for _, group := range groups {
keyword := "@" + *group.Name
keywords[keyword] = append(keywords[keyword], MentionableGroupID(group.Id))
keywords[keyword] = append(keywords[keyword], mentionableGroupID(group.Id))
}
return keywords
@@ -38,7 +38,7 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, nil, false)
assert.Contains(t, keywords["@user"], MentionableUserID(user.Id))
assert.Contains(t, keywords["@user"], mentionableUserID(user.Id))
})
t.Run("should add custom mention keywords", func(t *testing.T) {
@@ -54,9 +54,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, nil, false)
assert.Contains(t, keywords["apple"], MentionableUserID(user.Id))
assert.Contains(t, keywords["banana"], MentionableUserID(user.Id))
assert.Contains(t, keywords["orange"], MentionableUserID(user.Id))
assert.Contains(t, keywords["apple"], mentionableUserID(user.Id))
assert.Contains(t, keywords["banana"], mentionableUserID(user.Id))
assert.Contains(t, keywords["orange"], mentionableUserID(user.Id))
})
t.Run("should not add empty custom keywords", func(t *testing.T) {
@@ -90,9 +90,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, nil, false)
assert.Contains(t, keywords["William"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["william"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["Robert"], MentionableUserID(user.Id))
assert.Contains(t, keywords["William"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["william"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["Robert"], mentionableUserID(user.Id))
})
t.Run("should not add case sensitive first name if enabled but empty First Name", func(t *testing.T) {
@@ -110,7 +110,7 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, nil, false)
assert.NotContains(t, keywords[""], MentionableUserID(user.Id))
assert.NotContains(t, keywords[""], mentionableUserID(user.Id))
})
t.Run("should not add case sensitive first name if disabled", func(t *testing.T) {
@@ -128,9 +128,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, nil, false)
assert.NotContains(t, keywords["William"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["william"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["Robert"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["William"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["william"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["Robert"], mentionableUserID(user.Id))
})
t.Run("should add @channel/@all/@here when allowed", func(t *testing.T) {
@@ -149,9 +149,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, status, true)
assert.Contains(t, keywords["@channel"], MentionableUserID(user.Id))
assert.Contains(t, keywords["@all"], MentionableUserID(user.Id))
assert.Contains(t, keywords["@here"], MentionableUserID(user.Id))
assert.Contains(t, keywords["@channel"], mentionableUserID(user.Id))
assert.Contains(t, keywords["@all"], mentionableUserID(user.Id))
assert.Contains(t, keywords["@here"], mentionableUserID(user.Id))
})
t.Run("should not add @channel/@all/@here when not allowed", func(t *testing.T) {
@@ -170,9 +170,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, status, false)
assert.NotContains(t, keywords["@channel"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@channel"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], mentionableUserID(user.Id))
})
t.Run("should not add @channel/@all/@here when disabled for user", func(t *testing.T) {
@@ -191,9 +191,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, status, true)
assert.NotContains(t, keywords["@channel"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@channel"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], mentionableUserID(user.Id))
})
t.Run("should not add @channel/@all/@here when disabled for channel", func(t *testing.T) {
@@ -214,9 +214,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, status, true)
assert.NotContains(t, keywords["@channel"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@channel"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], mentionableUserID(user.Id))
})
t.Run("should not add @channel/@all/@here when channel is muted and channel mention setting is not updated by user", func(t *testing.T) {
@@ -238,9 +238,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, status, true)
assert.NotContains(t, keywords["@channel"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@channel"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@all"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], mentionableUserID(user.Id))
})
t.Run("should not add @here when when user is not online", func(t *testing.T) {
@@ -259,9 +259,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords := MentionKeywords{}
keywords.AddUser(user, channelNotifyProps, status, true)
assert.Contains(t, keywords["@channel"], MentionableUserID(user.Id))
assert.Contains(t, keywords["@all"], MentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], MentionableUserID(user.Id))
assert.Contains(t, keywords["@channel"], mentionableUserID(user.Id))
assert.Contains(t, keywords["@all"], mentionableUserID(user.Id))
assert.NotContains(t, keywords["@here"], mentionableUserID(user.Id))
})
t.Run("should add for multiple users", func(t *testing.T) {
@@ -284,9 +284,9 @@ func TestMentionKeywords_AddUserProfile(t *testing.T) {
keywords.AddUser(user1, map[string]string{}, nil, true)
keywords.AddUser(user2, map[string]string{}, nil, true)
assert.Contains(t, keywords["@user1"], MentionableUserID(user1.Id))
assert.Contains(t, keywords["@user2"], MentionableUserID(user2.Id))
assert.Contains(t, keywords["@all"], MentionableUserID(user1.Id))
assert.Contains(t, keywords["@all"], MentionableUserID(user2.Id))
assert.Contains(t, keywords["@user1"], mentionableUserID(user1.Id))
assert.Contains(t, keywords["@user2"], mentionableUserID(user2.Id))
assert.Contains(t, keywords["@all"], mentionableUserID(user1.Id))
assert.Contains(t, keywords["@all"], mentionableUserID(user2.Id))
})
}