goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display trust status in results

pull/34/head
Zlatin Balevsky 2019-12-08 22:30:38 +00:00
parent aa33709f04
commit 9d2bcf70c7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webui/src/main/java/com/muwire/webui/SearchServlet.java
View File

@ -11,6 +11,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.muwire.core.Core;
import com.muwire.core.InfoHash;
import com.muwire.core.Persona;
import com.muwire.core.search.UIResultEvent;
@ -20,6 +21,7 @@ import net.i2p.data.DataHelper;
public class SearchServlet extends HttpServlet {
private Core core;
private SearchManager searchManager;
private ConnectionCounter connectionCounter;
private DownloadManager downloadManager;
@ -92,6 +94,7 @@ public class SearchServlet extends HttpServlet {
sb.append("<SenderB64>").append(sender.toBase64()).append("</SenderB64>");
sb.append("<Browse>").append(resultsFromSender.iterator().next().getBrowse()).append("</Browse>");
sb.append("<Browsing>").append(browseManager.isBrowsing(sender)).append("</Browsing>");
sb.append("<Trust>").append(core.getTrustService().getLevel(sender.getDestination())).append("</Trust>");
resultsFromSender.forEach(result -> {
sb.append("<Result>");
sb.append("<Name>");
@ -148,6 +151,7 @@ public class SearchServlet extends HttpServlet {
sb.append("<SenderB64>").append(result.getSender().toBase64()).append("</SenderB64>");
sb.append("<Browse>").append(result.getBrowse()).append("</Browse>");
sb.append("<Browsing>").append(browseManager.isBrowsing(result.getSender())).append("</Browsing>");
sb.append("<Trust>").append(core.getTrustService().getLevel(result.getSender().getDestination())).append("</Trust>");
if (result.getComment() != null) {
sb.append("<Comment>")
.append(Util.escapeHTMLinXML(result.getComment()))
@ -188,6 +192,7 @@ public class SearchServlet extends HttpServlet {
connectionCounter = (ConnectionCounter) config.getServletContext().getAttribute("connectionCounter");
downloadManager = (DownloadManager) config.getServletContext().getAttribute("downloadManager");
browseManager = (BrowseManager) config.getServletContext().getAttribute("browseManager");
core = (Core) config.getServletContext().getAttribute("core");
}
}

8
webui/src/main/js/search.js
View File

@ -42,6 +42,7 @@ class ResultsBySender {
this.senderB64 = xmlNode.getElementsByTagName("SenderB64")[0].childNodes[0].nodeValue;
this.browse = xmlNode.getElementsByTagName("Browse")[0].childNodes[0].nodeValue;
this.browsing = xmlNode.getElementsByTagName("Browsing")[0].childNodes[0].nodeValue;
this.trust = xmlNode.getElementsByTagName("Trust")[0].childNodes[0].nodeValue;
this.results = new Map();
var resultNodes = xmlNode.getElementsByTagName("Result");
var i;
@ -87,6 +88,7 @@ class ResultByFile {
this.senderB64 = xmlNode.getElementsByTagName("SenderB64")[0].childNodes[0].nodeValue;
this.browse = xmlNode.getElementsByTagName("Browse")[0].childNodes[0].nodeValue;
this.browsing = xmlNode.getElementsByTagName("Browsing")[0].childNodes[0].nodeValue;
this.trust = xmlNode.getElementsByTagName("Trust")[0].childNodes[0].nodeValue;
this.comment = null;
var comment = xmlNode.getElementsByTagName("Comment")
if (comment.length == 1)
@ -205,7 +207,7 @@ function updateFile(fileInfoHash) {
resultsFromSpan.innerHTML = "Results For "+searchResults.name;
var resultsDiv = document.getElementById("bottomTable");
var table = "<table><thead><tr><th>Sender</th><th>Browse</th></tr></thead><tbody>";
var table = "<table><thead><tr><th>Sender</th><th>Browse</th><th>Trust</th></tr></thead><tbody>";
var i;
for (var [senderName, result] of searchResults.results) {
table += "<tr>";
@ -235,6 +237,7 @@ function updateFile(fileInfoHash) {
table += "<td><span id='browse-link-" + result.senderB64 + "'>" + getBrowseLink(result.senderB64) + "</span></td>"
}
}
table += "<td>" + result.trust + "</td>"
table += "</tr>";
}
table += "</tbody></table>";
@ -251,7 +254,7 @@ function updateUUIDBySender(resultUUID) {
currentSearchSpan.innerHTML = currentStatus.query + " Results";
var sendersDiv = document.getElementById("topTable");
var table = "<table><thead><tr><th>Sender</th><th>Browse</th></tr></thead><tbody>";
var table = "<table><thead><tr><th>Sender</th><th>Browse</th><th>Trust</th></tr></thead><tbody>";
var x = currentSearchBySender.resultBatches;
for (var [senderName, senderBatch] of x) {
table += "<tr><td><a href='#' onclick='updateSender(\""+senderName+"\");return false;'>"
@ -263,6 +266,7 @@ function updateUUIDBySender(resultUUID) {
else
table += "<td><span id='browse-link-" + senderBatch.senderB64 + "'>" + getBrowseLink(senderBatch.senderB64) + "</span></td>"
}
table += "<td>" + senderBatch.trust + "</td>"
table += "</tr>";
}
table += "</tbody></table>";