From c09f9eb8062ce9395c73e341f9fcb6b015bd734a Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Sun, 3 Nov 2019 01:57:35 +0100
Subject: [PATCH] =?utf8?q?=F0=9F=90=9B=20Make=20an=20identity=E2=80=99s=20?=
 =?utf8?q?nickname=20optional?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../net/pterodactylus/sone/freenet/wot/DefaultIdentity.kt  |  2 +-
 .../sone/freenet/wot/PluginWebOfTrustConnectorTest.kt      | 14 ++++++++++++++
 src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt    |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/DefaultIdentity.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/DefaultIdentity.kt
index 3398e7f..fe84584 100644
--- a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/DefaultIdentity.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/DefaultIdentity.kt
@@ -22,7 +22,7 @@ import java.util.Collections.*
 /**
  * A Web of Trust identity.
  */
-open class DefaultIdentity(private val id: String, private val nickname: String, private val requestUri: String) : Identity {
+open class DefaultIdentity(private val id: String, private val nickname: String?, private val requestUri: String) : Identity {
 
 	private val contexts = mutableSetOf<String>().synchronized()
 	private val properties = mutableMapOf<String, String>().synchronized()
diff --git a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/PluginWebOfTrustConnectorTest.kt b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/PluginWebOfTrustConnectorTest.kt
index 5db7fe3..84acd65 100644
--- a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/PluginWebOfTrustConnectorTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/PluginWebOfTrustConnectorTest.kt
@@ -109,6 +109,20 @@ class PluginWebOfTrustConnectorTest {
 	}
 
 	@Test
+	fun `trusted identity without nickname is returned correctly`() {
+		val trustedIdentities = createPluginConnector("GetIdentitiesByScore") {
+			put("Identity0", "id0")
+			put("RequestURI0", "request-uri0")
+		}.connect { loadTrustedIdentities(ownIdentity) }
+		assertThat(trustedIdentities, contains(
+				allOf(
+						isIdentity("id0", null, "request-uri0", empty<String>(), isEmptyMap()),
+						isTrusted(ownIdentity, isTrust(null, null, null))
+				)
+		))
+	}
+
+	@Test
 	fun `trusted identity with contexts is returned correctly`() {
 		val trustedIdentities = createPluginConnector("GetIdentitiesByScore") {
 			put("Identity0", "id0")
diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
index e7588db..7fc9428 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
@@ -58,7 +58,7 @@ fun isTrusted(ownIdentity: OwnIdentity, trust: Matcher<Trust>) = object : TypeSa
 	}
 }
 
-fun isIdentity(id: String, nickname: String, requestUri: String, contexts: Matcher<out Iterable<String>>, properties: Matcher<out Map<out String, String>>) =
+fun isIdentity(id: String, nickname: String?, requestUri: String, contexts: Matcher<out Iterable<String>>, properties: Matcher<out Map<out String, String>>) =
 		AttributeMatcher<Identity>("identity")
 				.addAttribute("id", id, Identity::getId)
 				.addAttribute("nickname", nickname, Identity::getNickname)
-- 
2.7.4