Skip to content

Commit

Permalink
AG-33440: Fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
forcomprehension committed Jun 21, 2024
1 parent 5fc5381 commit 583f9f8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
12 changes: 3 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v1.1.138] - 2024-06-18

## [v1.1.138] - 2024-06-21

### Added

- Added `downloadUrl` to generated filters metadata

[v1.1.138]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.137...v1.1.138

## [v1.1.137] - 2024-05-30

- `downloadUrl` to generated filters metadata

### Fixed

- Return the rules in their original order after applying the `@include` directive option `/optimiseDomainBlockingRules` [#217]

[v1.1.137]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.136...v1.1.137
[v1.1.138]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.136...v1.1.138

## [v1.1.136] - 2024-05-22

Expand Down
4 changes: 2 additions & 2 deletions src/main/platforms/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ module.exports = (() => {
* @param metadata
* @param config
*/
const postprocessUrls = (metadata, config) => {
const postProcessUrls = (metadata, config) => {
const useOptimized = OPTIMIZED_PLATFORMS_LIST.indexOf(config.platform) >= 0;

const result = {};
Expand Down Expand Up @@ -599,7 +599,7 @@ module.exports = (() => {
filters: replacedExpiresFiltersMetadata,
};

metadata = postprocessUrls(metadata, config);
metadata = postProcessUrls(metadata, config);
metadata = removeRedundantFiltersMetadata(metadata, config.platform);

if (platform === 'MAC') {
Expand Down
1 change: 1 addition & 0 deletions src/test/builder.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ describe('Test builder', () => {
expect(filtersMetadata.filters[0].description).toEqual('EasyList + AdGuard English filter. This filter is necessary for quality ad blocking.');
expect(filtersMetadata.filters[0].timeAdded).toBeTruthy();
expect(filtersMetadata.filters[0].homepage).toEqual('https://easylist.adblockplus.org/');
expect(filtersMetadata.filters[0].downloadUrl).toEqual('https://filters.adtidy.org/test/filters/2.txt');
// expires value parsed from the filter metadata
expect(filtersMetadata.filters[0].expires).toEqual(172800);
expect(filtersMetadata.filters[0].displayNumber).toEqual(101);
Expand Down

0 comments on commit 583f9f8

Please sign in to comment.