X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Freactor%2Ftriggers%2FNewTorrentTrigger.java;h=64ff693967762356d24990b7d627da1bc33e5f2f;hb=a6e8911302a7482787136ef41d1fdb0448d81c1f;hp=19268e984e15d428353f5fabe22003edad8c8bf5;hpb=b29bc5d72c7dc2cea5103eefdbf38d033a89a6e1;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/reactor/triggers/NewTorrentTrigger.java b/src/main/java/net/pterodactylus/reactor/triggers/NewTorrentTrigger.java
index 19268e9..64ff693 100644
--- a/src/main/java/net/pterodactylus/reactor/triggers/NewTorrentTrigger.java
+++ b/src/main/java/net/pterodactylus/reactor/triggers/NewTorrentTrigger.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkState;
 
 import java.util.List;
 
+import net.pterodactylus.reactor.Reaction;
 import net.pterodactylus.reactor.State;
 import net.pterodactylus.reactor.Trigger;
 import net.pterodactylus.reactor.output.DefaultOutput;
@@ -70,8 +71,8 @@ public class NewTorrentTrigger implements Trigger {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Output output() {
-		DefaultOutput output = new DefaultOutput(String.format("Found %d new Torrent(s)!", torrentFiles.size()));
+	public Output output(Reaction reaction) {
+		DefaultOutput output = new DefaultOutput(String.format("Found %d new Torrent(s) for “%s!”", torrentFiles.size(), reaction.name()));
 		output.addText("text/plain", getPlainTextList(torrentFiles));
 		output.addText("text/html", getHtmlTextList(torrentFiles));
 		return output;
@@ -95,8 +96,12 @@ public class NewTorrentTrigger implements Trigger {
 			plainText.append(torrentFile.name()).append('\n');
 			plainText.append('\t').append(torrentFile.size()).append(" in ").append(torrentFile.fileCount()).append(" file(s)\n");
 			plainText.append('\t').append(torrentFile.seedCount()).append(" seed(s), ").append(torrentFile.leechCount()).append(" leecher(s)\n");
-			plainText.append('\t').append(torrentFile.magnetUri()).append('\n');
-			plainText.append('\t').append(torrentFile.downloadUri()).append('\n');
+			if ((torrentFile.magnetUri() != null) && (torrentFile.magnetUri().length() > 0)) {
+				plainText.append('\t').append(torrentFile.magnetUri()).append('\n');
+			}
+			if ((torrentFile.downloadUri() != null) && (torrentFile.downloadUri().length() > 0)) {
+				plainText.append('\t').append(torrentFile.downloadUri()).append('\n');
+			}
 			plainText.append('\n');
 		}
 		return plainText.toString();
@@ -118,8 +123,12 @@ public class NewTorrentTrigger implements Trigger {
 			htmlText.append("<li><strong>").append(StringEscapeUtils.escapeHtml4(torrentFile.name())).append("</strong></li>");
 			htmlText.append("<div>Size: <strong>").append(StringEscapeUtils.escapeHtml4(torrentFile.size())).append("</strong> in <strong>").append(torrentFile.fileCount()).append("</strong> file(s)</div>");
 			htmlText.append("<div><strong>").append(torrentFile.seedCount()).append("</strong> seed(s), <strong>").append(torrentFile.leechCount()).append("</strong> leecher(s)</div>");
-			htmlText.append(String.format("<div><a href=\"%s\">Magnet URI</a></div>", StringEscapeUtils.escapeHtml4(torrentFile.magnetUri())));
-			htmlText.append(String.format("<div><a href=\"%s\">Download URI</a></div>", StringEscapeUtils.escapeHtml4(torrentFile.downloadUri())));
+			if ((torrentFile.magnetUri() != null) && (torrentFile.magnetUri().length() > 0)) {
+				htmlText.append(String.format("<div><a href=\"%s\">Magnet URI</a></div>", StringEscapeUtils.escapeHtml4(torrentFile.magnetUri())));
+			}
+			if ((torrentFile.downloadUri() != null) && (torrentFile.downloadUri().length() > 0)) {
+				htmlText.append(String.format("<div><a href=\"%s\">Download URI</a></div>", StringEscapeUtils.escapeHtml4(torrentFile.downloadUri())));
+			}
 		}
 		htmlText.append("</ul>\n");
 		htmlText.append("</body></html>\n");