summaryrefslogtreecommitdiff
path: root/internal/processing/filters
diff options
context:
space:
mode:
Diffstat (limited to 'internal/processing/filters')
-rw-r--r--internal/processing/filters/v1/create.go10
-rw-r--r--internal/processing/filters/v1/delete.go3
-rw-r--r--internal/processing/filters/v1/filters.go5
-rw-r--r--internal/processing/filters/v1/update.go10
-rw-r--r--internal/processing/filters/v2/create.go10
-rw-r--r--internal/processing/filters/v2/delete.go3
-rw-r--r--internal/processing/filters/v2/filters.go5
-rw-r--r--internal/processing/filters/v2/keywordcreate.go3
-rw-r--r--internal/processing/filters/v2/keyworddelete.go3
-rw-r--r--internal/processing/filters/v2/keywordupdate.go3
-rw-r--r--internal/processing/filters/v2/statuscreate.go3
-rw-r--r--internal/processing/filters/v2/statusdelete.go3
-rw-r--r--internal/processing/filters/v2/update.go10
13 files changed, 65 insertions, 6 deletions
diff --git a/internal/processing/filters/v1/create.go b/internal/processing/filters/v1/create.go
index e36d6800a..4d8ffc3e1 100644
--- a/internal/processing/filters/v1/create.go
+++ b/internal/processing/filters/v1/create.go
@@ -83,5 +83,13 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form
return nil, gtserror.NewErrorInternalError(err)
}
- return p.apiFilter(ctx, filterKeyword)
+ apiFilter, errWithCode := p.apiFilter(ctx, filterKeyword)
+ if errWithCode != nil {
+ return nil, errWithCode
+ }
+
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
+ return apiFilter, nil
}
diff --git a/internal/processing/filters/v1/delete.go b/internal/processing/filters/v1/delete.go
index f2312f039..89282c65d 100644
--- a/internal/processing/filters/v1/delete.go
+++ b/internal/processing/filters/v1/delete.go
@@ -63,5 +63,8 @@ func (p *Processor) Delete(
}
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return nil
}
diff --git a/internal/processing/filters/v1/filters.go b/internal/processing/filters/v1/filters.go
index d46c9e72c..daa9087a9 100644
--- a/internal/processing/filters/v1/filters.go
+++ b/internal/processing/filters/v1/filters.go
@@ -18,6 +18,7 @@
package v1
import (
+ "github.com/superseriousbusiness/gotosocial/internal/processing/stream"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
)
@@ -25,11 +26,13 @@ import (
type Processor struct {
state *state.State
converter *typeutils.Converter
+ stream *stream.Processor
}
-func New(state *state.State, converter *typeutils.Converter) Processor {
+func New(state *state.State, converter *typeutils.Converter, stream *stream.Processor) Processor {
return Processor{
state: state,
converter: converter,
+ stream: stream,
}
}
diff --git a/internal/processing/filters/v1/update.go b/internal/processing/filters/v1/update.go
index 0421dc786..2c2fe5574 100644
--- a/internal/processing/filters/v1/update.go
+++ b/internal/processing/filters/v1/update.go
@@ -163,5 +163,13 @@ func (p *Processor) Update(
return nil, gtserror.NewErrorInternalError(err)
}
- return p.apiFilter(ctx, filterKeyword)
+ apiFilter, errWithCode := p.apiFilter(ctx, filterKeyword)
+ if errWithCode != nil {
+ return nil, errWithCode
+ }
+
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
+ return apiFilter, nil
}
diff --git a/internal/processing/filters/v2/create.go b/internal/processing/filters/v2/create.go
index c7b500e9e..d429e1139 100644
--- a/internal/processing/filters/v2/create.go
+++ b/internal/processing/filters/v2/create.go
@@ -71,5 +71,13 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form
return nil, gtserror.NewErrorInternalError(err)
}
- return p.apiFilter(ctx, filter)
+ apiFilter, errWithCode := p.apiFilter(ctx, filter)
+ if errWithCode != nil {
+ return nil, errWithCode
+ }
+
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
+ return apiFilter, nil
}
diff --git a/internal/processing/filters/v2/delete.go b/internal/processing/filters/v2/delete.go
index b1bebdcb6..a312180b8 100644
--- a/internal/processing/filters/v2/delete.go
+++ b/internal/processing/filters/v2/delete.go
@@ -49,5 +49,8 @@ func (p *Processor) Delete(
return gtserror.NewErrorInternalError(err)
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return nil
}
diff --git a/internal/processing/filters/v2/filters.go b/internal/processing/filters/v2/filters.go
index dfb6a8992..85da4df6b 100644
--- a/internal/processing/filters/v2/filters.go
+++ b/internal/processing/filters/v2/filters.go
@@ -18,6 +18,7 @@
package v2
import (
+ "github.com/superseriousbusiness/gotosocial/internal/processing/stream"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
)
@@ -25,11 +26,13 @@ import (
type Processor struct {
state *state.State
converter *typeutils.Converter
+ stream *stream.Processor
}
-func New(state *state.State, converter *typeutils.Converter) Processor {
+func New(state *state.State, converter *typeutils.Converter, stream *stream.Processor) Processor {
return Processor{
state: state,
converter: converter,
+ stream: stream,
}
}
diff --git a/internal/processing/filters/v2/keywordcreate.go b/internal/processing/filters/v2/keywordcreate.go
index 711b855fa..92d9e5dfd 100644
--- a/internal/processing/filters/v2/keywordcreate.go
+++ b/internal/processing/filters/v2/keywordcreate.go
@@ -63,5 +63,8 @@ func (p *Processor) KeywordCreate(ctx context.Context, account *gtsmodel.Account
return nil, gtserror.NewErrorInternalError(err)
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return p.converter.FilterKeywordToAPIFilterKeyword(ctx, filterKeyword), nil
}
diff --git a/internal/processing/filters/v2/keyworddelete.go b/internal/processing/filters/v2/keyworddelete.go
index edf57167d..024991109 100644
--- a/internal/processing/filters/v2/keyworddelete.go
+++ b/internal/processing/filters/v2/keyworddelete.go
@@ -49,5 +49,8 @@ func (p *Processor) KeywordDelete(
return gtserror.NewErrorInternalError(err)
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return nil
}
diff --git a/internal/processing/filters/v2/keywordupdate.go b/internal/processing/filters/v2/keywordupdate.go
index 9a4058c23..9492e7b3a 100644
--- a/internal/processing/filters/v2/keywordupdate.go
+++ b/internal/processing/filters/v2/keywordupdate.go
@@ -62,5 +62,8 @@ func (p *Processor) KeywordUpdate(
return nil, gtserror.NewErrorInternalError(err)
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return p.converter.FilterKeywordToAPIFilterKeyword(ctx, filterKeyword), nil
}
diff --git a/internal/processing/filters/v2/statuscreate.go b/internal/processing/filters/v2/statuscreate.go
index a211dec2e..7d4469eef 100644
--- a/internal/processing/filters/v2/statuscreate.go
+++ b/internal/processing/filters/v2/statuscreate.go
@@ -62,5 +62,8 @@ func (p *Processor) StatusCreate(ctx context.Context, account *gtsmodel.Account,
return nil, gtserror.NewErrorInternalError(err)
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return p.converter.FilterStatusToAPIFilterStatus(ctx, filterStatus), nil
}
diff --git a/internal/processing/filters/v2/statusdelete.go b/internal/processing/filters/v2/statusdelete.go
index a428e7409..706ca691d 100644
--- a/internal/processing/filters/v2/statusdelete.go
+++ b/internal/processing/filters/v2/statusdelete.go
@@ -49,5 +49,8 @@ func (p *Processor) StatusDelete(
return gtserror.NewErrorInternalError(err)
}
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
return nil
}
diff --git a/internal/processing/filters/v2/update.go b/internal/processing/filters/v2/update.go
index aecb53337..5322f63d9 100644
--- a/internal/processing/filters/v2/update.go
+++ b/internal/processing/filters/v2/update.go
@@ -121,5 +121,13 @@ func (p *Processor) Update(
filter.Keywords = filterKeywords
filter.Statuses = filterStatuses
- return p.apiFilter(ctx, filter)
+ apiFilter, errWithCode := p.apiFilter(ctx, filter)
+ if errWithCode != nil {
+ return nil, errWithCode
+ }
+
+ // Send a filters changed event.
+ p.stream.FiltersChanged(ctx, account)
+
+ return apiFilter, nil
}