Skip to content

don't separate in-game search into keywords #1100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kylometra merged 2 commits into from
Oct 31, 2025
Merged

don't separate in-game search into keywords #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe1c08b
yeah
kylometra Oct 28, 2025
b7f6a89
remove now irrelevant tests
kylometra Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions ProjectLighthouse.Tests/Unit/FilterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,34 +749,6 @@ public void TeamPickFilter_ShouldReject_WhenNotTeamPick()
Assert.False(teamPickFunc(slot));
}

[Fact]
public void TextFilter_ShouldAccept_WhenDescriptionContainsText()
{
TextFilter textFilter = new("test");
Func<SlotEntity, bool> textFunc = textFilter.GetPredicate().Compile();

SlotEntity slot = new()
{
Description = "unit test",
};

Assert.True(textFunc(slot));
}

[Fact]
public void TextFilter_ShouldReject_WhenDescriptionDoesNotContainText()
{
TextFilter textFilter = new("test");
Func<SlotEntity, bool> textFunc = textFilter.GetPredicate().Compile();

SlotEntity slot = new()
{
Description = "fraction exam",
};

Assert.False(textFunc(slot));
}

[Fact]
public void TextFilter_ShouldAccept_WhenNameContainsText()
{
Expand Down
14 changes: 5 additions & 9 deletions ProjectLighthouse/Filter/Filters/TextFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,11 @@ public TextFilter(string filter)
public Expression<Func<SlotEntity, bool>> GetPredicate()
{
Expression<Func<SlotEntity, bool>> predicate = PredicateExtensions.False<SlotEntity>();
string[] keywords = this.filter.Split(" ", StringSplitOptions.RemoveEmptyEntries);
foreach (string keyword in keywords)
{
predicate = predicate.Or(s =>
s.Name.Contains(keyword) ||
s.Description.ToLower().Contains(keyword) ||
s.SlotId.ToString().Equals(keyword));
predicate = predicate.Or(s => s.Creator != null && s.Creator.Username.Contains(keyword));
}
string trimmed = this.filter.Trim();
predicate = predicate.Or(s =>
s.Name.Contains(trimmed) ||
s.SlotId.ToString().Equals(trimmed));
predicate = predicate.Or(s => s.Creator != null && s.Creator.Username.Contains(trimmed));
return predicate;
}
}