Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(control/search) Add ability to suggest removing a site from random exploration

Browse Source 
This is what most complaints have been about.
This commit is contained in:
Viktor Lofgren 2023-11-02 15:29:49 +01:00
parent 3047e2dd7c
commit 8e9698c9a0
6 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java
View File

@ -32,7 +32,8 @@ public class SearchFlagSiteService {
new CategoryItem("freebooting", "Reposting Stolen Content"),
new CategoryItem("broken", "Broken Website"),
new CategoryItem("shock", "Shocking/Offensive"),
new CategoryItem("blacklist", "Review Blacklisting")
new CategoryItem("blacklist", "Review Blacklisting"),
new CategoryItem("no-random", "Remove from Random Exploration")
);
private final Map<String, CategoryItem> categoryItemMap =

2
code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb
View File

@ -112,4 +112,4 @@
</section>
</footer>
<script src="tts.js" rel="javascript"></script>
<script src="/tts.js" rel="javascript"></script>

1
code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/DomainComplaintCategory.java
View File

@ -6,6 +6,7 @@ public enum DomainComplaintCategory {
BROKEN("broken"),
SHOCK("shock"),
BLACKLIST("blacklist"),
REMOVE_EXPLORATION("no-random"),
UNKNOWN("unknown");
private final String categoryName;

15
code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/DomainComplaintService.java
View File

@ -2,6 +2,7 @@ package nu.marginalia.control.app.svc;
import com.google.inject.Inject;
import com.zaxxer.hikari.HikariDataSource;
import lombok.SneakyThrows;
import nu.marginalia.control.Redirects;
import nu.marginalia.control.app.model.DomainComplaintCategory;
import nu.marginalia.control.app.model.DomainComplaintModel;
@ -27,16 +28,19 @@ public class DomainComplaintService {
private final HikariDataSource dataSource;
private final RendererFactory rendererFactory;
private final ControlBlacklistService blacklistService;
private final RandomExplorationService randomExplorationService;
private final Logger logger = LoggerFactory.getLogger(getClass());
@Inject
public DomainComplaintService(HikariDataSource dataSource,
RendererFactory rendererFactory,
ControlBlacklistService blacklistService
ControlBlacklistService blacklistService,
RandomExplorationService randomExplorationService
) {
this.dataSource = dataSource;
this.rendererFactory = rendererFactory;
this.blacklistService = blacklistService;
this.randomExplorationService = randomExplorationService;
}
public void register() throws IOException {
@ -59,6 +63,7 @@ public class DomainComplaintService {
return Map.of("complaintsNew", unreviewed, "complaintsReviewed", reviewed);
}
@SneakyThrows
private Object reviewComplaint(Request request, Response response) {
var domain = new EdgeDomain(request.params("domain"));
String action = request.queryParams("action");
@ -68,6 +73,7 @@ public class DomainComplaintService {
switch (action) {
case "noop" -> reviewNoAction(domain);
case "appeal" -> approveAppealBlacklisting(domain);
case "no-random" -> removeFromRandomDomains(domain);
case "blacklist" -> blacklistDomain(domain);
default -> throw new UnsupportedOperationException();
}
@ -75,7 +81,6 @@ public class DomainComplaintService {
return "";
}
public List<DomainComplaintModel> getComplaints() {
try (var conn = dataSource.getConnection();
var stmt = conn.prepareStatement("""
@ -109,6 +114,12 @@ public class DomainComplaintService {
setDecision(domain, "APPROVED");
}
private void removeFromRandomDomains(EdgeDomain domain) throws SQLException {
randomExplorationService.removeDomain(domain);
setDecision(domain, "REMOVED-FROM-RANDOM");
}
public void blacklistDomain(EdgeDomain domain) {
blacklistService.addToBlacklist(domain, "Domain complaint");

15
code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/RandomExplorationService.java
View File

@ -3,6 +3,7 @@ package nu.marginalia.control.app.svc;
import com.google.inject.Inject;
import com.zaxxer.hikari.HikariDataSource;
import gnu.trove.list.array.TIntArrayList;
import nu.marginalia.model.EdgeDomain;
import nu.marginalia.renderer.RendererFactory;
import spark.Request;
import spark.Response;
@ -108,6 +109,20 @@ public class RandomExplorationService {
}
}
public void removeDomain(EdgeDomain domain) throws SQLException {
try (var conn = dataSource.getConnection();
var stmt = conn.prepareStatement("""
DELETE EC_RANDOM_DOMAINS
FROM EC_RANDOM_DOMAINS
INNER JOIN EC_DOMAIN ON EC_DOMAIN.ID = EC_RANDOM_DOMAINS.DOMAIN_ID
WHERE EC_DOMAIN.DOMAIN_NAME = ?
"""))
{
stmt.setString(1, domain.toString());
stmt.executeUpdate();
}
}
public record RandomDomainResult(int id, String domainName) {}
}

1
code/services-core/control-service/src/main/resources/templates/control/app/domain-complaints.hdb
View File

@ -43,6 +43,7 @@
{{/if}}
{{#unless appeal}}
<li><a class="dropdown-item" href="#" onClick="handleComplaint('{{domain}}', 'blacklist')">Add Sanction</a></li>
<li><a class="dropdown-item" href="#" onClick="handleComplaint('{{domain}}', 'no-random')">Remove From Random Domains</a></li>
{{/unless}}
<li><a class="dropdown-item" href="#" onClick="handleComplaint('{{domain}}', 'noop')">Ignore</a></li>
</ul>