Merge branch 'release'

# Conflicts:
#	marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/command/commands/BrowseCommand.java
This commit is contained in:
vlofgren 2022-10-30 11:33:06 +01:00
commit 27893b414b

View File

@ -23,7 +23,6 @@ import java.util.regex.Pattern;
public class BrowseCommand implements SearchCommandInterface { public class BrowseCommand implements SearchCommandInterface {
private final EdgeDataStoreDao edgeDataStoreDao; private final EdgeDataStoreDao edgeDataStoreDao;
private final ScreenshotService screenshotService;
private final EdgeDomainBlacklist blacklist; private final EdgeDomainBlacklist blacklist;
private final MustacheRenderer<BrowseResultSet> browseResultsRenderer; private final MustacheRenderer<BrowseResultSet> browseResultsRenderer;
private final BrowseResultCleaner browseResultCleaner; private final BrowseResultCleaner browseResultCleaner;
@ -32,14 +31,12 @@ public class BrowseCommand implements SearchCommandInterface {
@Inject @Inject
public BrowseCommand(EdgeDataStoreDao edgeDataStoreDao, public BrowseCommand(EdgeDataStoreDao edgeDataStoreDao,
ScreenshotService screenshotService,
EdgeDomainBlacklist blacklist, EdgeDomainBlacklist blacklist,
RendererFactory rendererFactory, RendererFactory rendererFactory,
BrowseResultCleaner browseResultCleaner) BrowseResultCleaner browseResultCleaner)
throws IOException throws IOException
{ {
this.edgeDataStoreDao = edgeDataStoreDao; this.edgeDataStoreDao = edgeDataStoreDao;
this.screenshotService = screenshotService;
this.blacklist = blacklist; this.blacklist = blacklist;
this.browseResultCleaner = browseResultCleaner; this.browseResultCleaner = browseResultCleaner;