nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove the unused encryption field from NIP-94

Browse Source
This commit is contained in:
Vitor Pamplona
2024-11-18 17:29:59 -05:00
parent 4651074774
commit 72f317717b
7 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/main/java/com/vitorpamplona/quartz/events/FileHeaderEvent.kt
-9
View File
@@ -38,8 +38,6 @@ class FileHeaderEvent(
fun urls() = tags.filter { it.size > 1 && it[0] == URL }.map { it[1] }
fun encryptionKey() = tags.firstOrNull { it.size > 2 && it[0] == ENCRYPTION_KEY }?.let { AESGCM(it[1], it[2]) }
fun mimeType() = tags.firstOrNull { it.size > 1 && it[0] == MIME_TYPE }?.get(1)
fun hash() = tags.firstOrNull { it.size > 1 && it[0] == HASH }?.get(1)
@@ -88,7 +86,6 @@ class FileHeaderEvent(
originalHash: String? = null,
magnetURI: String? = null,
torrentInfoHash: String? = null,
encryptionKey: AESGCM? = null,
sensitiveContent: Boolean? = null,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
@@ -107,7 +104,6 @@ class FileHeaderEvent(
originalHash?.let { arrayOf(ORIGINAL_HASH, it) },
magnetURI?.let { arrayOf(MAGNET_URI, it) },
torrentInfoHash?.let { arrayOf(TORRENT_INFOHASH, it) },
encryptionKey?.let { arrayOf(ENCRYPTION_KEY, it.key, it.nonce) },
sensitiveContent?.let {
if (it) {
arrayOf("content-warning", "")
@@ -122,8 +118,3 @@ class FileHeaderEvent(
}
}
}
data class AESGCM(
val key: String,
val nonce: String,
)
quartz/src/main/java/com/vitorpamplona/quartz/events/FileStorageEvent.kt
-2
View File
@@ -40,8 +40,6 @@ class FileStorageEvent(
fun type() = tags.firstOrNull { it.size > 1 && it[0] == TYPE }?.get(1)
fun decryptKey() = tags.firstOrNull { it.size > 2 && it[0] == DECRYPT }?.let { AESGCM(it[1], it[2]) }
fun decode(): ByteArray? =
try {
Base64.getDecoder().decode(content)
quartz/src/main/java/com/vitorpamplona/quartz/events/FileStorageHeaderEvent.kt
-4
View File
@@ -36,8 +36,6 @@ class FileStorageHeaderEvent(
) : Event(id, pubKey, createdAt, KIND, tags, content, sig) {
fun dataEventId() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
fun encryptionKey() = tags.firstOrNull { it.size > 2 && it[0] == ENCRYPTION_KEY }?.let { AESGCM(it[1], it[2]) }
fun mimeType() = tags.firstOrNull { it.size > 1 && it[0] == MIME_TYPE }?.get(1)
fun hash() = tags.firstOrNull { it.size > 1 && it[0] == HASH }?.get(1)
@@ -80,7 +78,6 @@ class FileStorageHeaderEvent(
blurhash: String? = null,
magnetURI: String? = null,
torrentInfoHash: String? = null,
encryptionKey: AESGCM? = null,
sensitiveContent: Boolean? = null,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
@@ -97,7 +94,6 @@ class FileStorageHeaderEvent(
blurhash?.let { arrayOf(BLUR_HASH, it) },
magnetURI?.let { arrayOf(MAGNET_URI, it) },
torrentInfoHash?.let { arrayOf(TORRENT_INFOHASH, it) },
encryptionKey?.let { arrayOf(ENCRYPTION_KEY, it.key, it.nonce) },
sensitiveContent?.let {
if (it) {
arrayOf("content-warning", "")
quartz/src/main/java/com/vitorpamplona/quartz/events/ProfileGalleryEntryEvent.kt
-4
View File
@@ -38,8 +38,6 @@ class ProfileGalleryEntryEvent(
fun urls() = tags.filter { it.size > 1 && it[0] == URL }.map { it[1] }
fun encryptionKey() = tags.firstOrNull { it.size > 2 && it[0] == ENCRYPTION_KEY }?.let { AESGCM(it[1], it[2]) }
fun mimeType() = tags.firstOrNull { it.size > 1 && it[0] == MIME_TYPE }?.get(1)
fun hash() = tags.firstOrNull { it.size > 1 && it[0] == HASH }?.get(1)
@@ -94,7 +92,6 @@ class ProfileGalleryEntryEvent(
originalHash: String? = null,
magnetURI: String? = null,
torrentInfoHash: String? = null,
encryptionKey: AESGCM? = null,
sensitiveContent: Boolean? = null,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
@@ -117,7 +114,6 @@ class ProfileGalleryEntryEvent(
originalHash?.let { arrayOf(ORIGINAL_HASH, it) },
magnetURI?.let { arrayOf(MAGNET_URI, it) },
torrentInfoHash?.let { arrayOf(TORRENT_INFOHASH, it) },
encryptionKey?.let { arrayOf(ENCRYPTION_KEY, it.key, it.nonce) },
sensitiveContent?.let {
if (it) {
arrayOf("content-warning", "")
quartz/src/main/java/com/vitorpamplona/quartz/events/VideoEvent.kt
-2
View File
@@ -99,7 +99,6 @@ abstract class VideoEvent(
originalHash: String? = null,
magnetURI: String? = null,
torrentInfoHash: String? = null,
encryptionKey: AESGCM? = null,
sensitiveContent: Boolean? = null,
altDescription: String,
signer: NostrSigner,
@@ -119,7 +118,6 @@ abstract class VideoEvent(
originalHash?.let { arrayOf(ORIGINAL_HASH, it) },
magnetURI?.let { arrayOf(MAGNET_URI, it) },
torrentInfoHash?.let { arrayOf(TORRENT_INFOHASH, it) },
encryptionKey?.let { arrayOf(ENCRYPTION_KEY, it.key, it.nonce) },
sensitiveContent?.let {
if (it) {
arrayOf("content-warning", "")
quartz/src/main/java/com/vitorpamplona/quartz/events/VideoHorizontalEvent.kt
-2
View File
@@ -50,7 +50,6 @@ class VideoHorizontalEvent(
originalHash: String? = null,
magnetURI: String? = null,
torrentInfoHash: String? = null,
encryptionKey: AESGCM? = null,
sensitiveContent: Boolean? = null,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
@@ -69,7 +68,6 @@ class VideoHorizontalEvent(
originalHash,
magnetURI,
torrentInfoHash,
encryptionKey,
sensitiveContent,
ALT_DESCRIPTION,
signer,
quartz/src/main/java/com/vitorpamplona/quartz/events/VideoVerticalEvent.kt
-2
View File
@@ -50,7 +50,6 @@ class VideoVerticalEvent(
originalHash: String? = null,
magnetURI: String? = null,
torrentInfoHash: String? = null,
encryptionKey: AESGCM? = null,
sensitiveContent: Boolean? = null,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
@@ -69,7 +68,6 @@ class VideoVerticalEvent(
originalHash,
magnetURI,
torrentInfoHash,
encryptionKey,
sensitiveContent,
ALT_DESCRIPTION,
signer,