Skip to content

Commit

Permalink
Merge pull request #95 in ADGUARD-FILTERS/scriptlets from fix/AG-1137…
Browse files Browse the repository at this point in the history
… to master

* commit '4c3c0bc31c38b6cc0e10f85fb476f5f305ebe77d':
  add comments
  replace isRedirectRule by specific methods
  • Loading branch information
slavaleleka committed Mar 5, 2020
2 parents 054db54 + 4c3c0bc commit 6a96d49
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 8 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,13 @@ redirects.getCode(source);

```javascript
/**
* Checks if the `rule` satisfies the `type`
* @param {string} rule - rule text
* @param {'ADG'|'UBO'|'ABP'} type - type of a redirect rule
*/
redirects.isRedirectRule(rule, type);
* Checks if the `rule` is AdGuard / Ubo / Abp redirect resource rule
* @param {string} rule - rule text
* @returns {boolean}
*/
redirects.isAdgRedirectRule(rule);
redirects.isUboRedirectRule(rule);
redirects.isAbpRedirectRule(rule);
```

```javascript
Expand Down
34 changes: 33 additions & 1 deletion dist/cjs/scriptletsCjs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 33 additions & 1 deletion dist/scriptlets.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 30 additions & 1 deletion src/redirects/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,38 @@ const getRedirectCode = (name) => {
return passSourceAndProps({ name }, result);
};

/**
* Checks if the `rule` is AdGuard redirect resource rule
* @param {string} rule - rule text
* @returns {boolean}
*/
const isAdgRedirectRule = (rule) => {
return validator.isRedirectRule(rule, 'ADG');
};

/**
* Checks if the `rule` is Ubo redirect resource rule
* @param {string} rule - rule text
* @returns {boolean}
*/
const isUboRedirectRule = (rule) => {
return validator.isRedirectRule(rule, 'UBO');
};

/**
* Checks if the `rule` is Abp redirect resource rule
* @param {string} rule - rule text
* @returns {boolean}
*/
const isAbpRedirectRule = (rule) => {
return validator.isRedirectRule(rule, 'ABP');
};

export const redirectsCjs = {
getCode: getRedirectCode,
isRedirectRule: validator.isRedirectRule,
isAdgRedirectRule,
isUboRedirectRule,
isAbpRedirectRule,
convertUboRedirectToAdg,
convertAbpRedirectToAdg,
convertRedirectToAdg,
Expand Down

0 comments on commit 6a96d49

Please sign in to comment.