From 258ecae0169e9e8bb60554b0fc38ec080acbf089 Mon Sep 17 00:00:00 2001
From: bakito <github@bakito.ch>
Date: Sun, 18 Apr 2021 18:04:53 +0200
Subject: [PATCH] fix filter synch error

---
 pkg/sync/sync.go      | 8 ++++----
 pkg/sync/sync_test.go | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/sync/sync.go b/pkg/sync/sync.go
index e363a7b..5300881 100644
--- a/pkg/sync/sync.go
+++ b/pkg/sync/sync.go
@@ -220,10 +220,10 @@ func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) e
 		return err
 	}
 
-	if err = w.syncFilterType(of, rf.Filters, false, replica); err != nil {
+	if err = w.syncFilterType(of.Filters, rf.Filters, false, replica); err != nil {
 		return err
 	}
-	if err = w.syncFilterType(of, rf.WhitelistFilters, true, replica); err != nil {
+	if err = w.syncFilterType(of.WhitelistFilters, rf.WhitelistFilters, true, replica); err != nil {
 		return err
 	}
 
@@ -239,8 +239,8 @@ func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) e
 	return nil
 }
 
-func (w *worker) syncFilterType(of *types.FilteringStatus, rFilters types.Filters, whitelist bool, replica client.Client) error {
-	fa, fu, fd := rFilters.Merge(of.Filters)
+func (w *worker) syncFilterType(of types.Filters, rFilters types.Filters, whitelist bool, replica client.Client) error {
+	fa, fu, fd := rFilters.Merge(of)
 
 	if err := replica.AddFilters(whitelist, fa...); err != nil {
 		return err
diff --git a/pkg/sync/sync_test.go b/pkg/sync/sync_test.go
index 949403b..13d6c9f 100644
--- a/pkg/sync/sync_test.go
+++ b/pkg/sync/sync_test.go
@@ -2,6 +2,7 @@ package sync
 
 import (
 	"errors"
+
 	"github.com/bakito/adguardhome-sync/pkg/client"
 
 	. "github.com/onsi/ginkgo"