Skip to content
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

[IMPROVE] Add file-title and file-desc as new filter tag options on message search #16858

Merged
merged 3 commits into from
Apr 21, 2020
Merged

[IMPROVE] Add file-title and file-desc as new filter tag options on message search #16858

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e8d0e2
[IMPROVE] add option for description and title search
subham103 Mar 12, 2020
08b9bef
Apply suggestions from code review
rodrigok Apr 20, 2020
99b9db4
Merge branch 'develop' into messageSearch
rodrigok Apr 20, 2020
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
14 changes: 14 additions & 0 deletions server/methods/messageSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@ Meteor.methods({
return '';
}

function filterTitle(_, tag) {
query['attachments.title'] = new RegExp(s.escapeRegExp(tag), 'i');
return '';
}

function filterDescription(_, tag) {
query['attachments.description'] = new RegExp(s.escapeRegExp(tag), 'i');
return '';
}

function sortByTimestamp(_, direction) {
if (direction.startsWith('asc')) {
options.sort.ts = 1;
Expand Down Expand Up @@ -171,6 +181,10 @@ Meteor.methods({
text = text.replace(/has:location|has:map/g, filterLocation);
// Filter image tags
text = text.replace(/label:(\w+)/g, filterLabel);
// Filter on description of messages.
text = text.replace(/file-desc:(\w+)/g, filterDescription);
// Filter on title of messages.
text = text.replace(/file-title:(\w+)/g, filterTitle);
// Filtering before/after/on a date
// matches dd-MM-yyyy, dd/MM/yyyy, dd-MM-yyyy, prefixed by before:, after: and on: respectively.
// Example: before:15/09/2016 after: 10-08-2016
Expand Down