From 53d692ec7f488670aafebc58fe6d04be14070c0b Mon Sep 17 00:00:00 2001
From: maxmoney21m <maxmoney@nostrplebs.com>
Date: Mon, 13 Mar 2023 23:02:53 +0800
Subject: [PATCH] Add user-agent header, fixes #259

---
 .../vitorpamplona/amethyst/service/Nip05Verifier.kt    |  5 ++++-
 .../amethyst/service/lnurl/LightningAddressResolver.kt | 10 ++++++++--
 .../com/vitorpamplona/amethyst/service/relays/Relay.kt |  5 ++++-
 .../vitorpamplona/amethyst/ui/actions/ImageSaver.kt    |  1 +
 .../vitorpamplona/amethyst/ui/actions/ImageUploader.kt |  3 ++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
index 27555bcac..81edc34ae 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
@@ -42,7 +42,10 @@ class Nip05Verifier {
 
         withContext(Dispatchers.IO) {
             try {
-                val request: Request = Request.Builder().url(url).build()
+                val request = Request.Builder()
+                    .header("User-Agent", "Amethyst")
+                    .url(url)
+                    .build()
 
                 client.newCall(request).enqueue(object : Callback {
                     override fun onResponse(call: Call, response: Response) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
index 1a2371805..7beaf1777 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
@@ -51,7 +51,10 @@ class LightningAddressResolver {
         }
 
         withContext(Dispatchers.IO) {
-            val request: Request = Request.Builder().url(url).build()
+            val request: Request = Request.Builder()
+                .header("User-Agent", "Amethyst")
+                .url(url)
+                .build()
 
             client.newCall(request).enqueue(object : Callback {
                 override fun onResponse(call: Call, response: Response) {
@@ -91,7 +94,10 @@ class LightningAddressResolver {
                 url += "&nostr=$encodedNostrRequest"
             }
 
-            val request: Request = Request.Builder().url(url).build()
+            val request: Request = Request.Builder()
+                .header("User-Agent", "Amethyst")
+                .url(url)
+                .build()
 
             client.newCall(request).enqueue(object : Callback {
                 override fun onResponse(call: Call, response: Response) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
index 3b132324f..309badbf0 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
@@ -55,7 +55,10 @@ class Relay(
         if (socket != null) return
 
         try {
-            val request = Request.Builder().url(url.trim()).build()
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst")
+                .url(url.trim())
+                .build()
             val listener = object : WebSocketListener() {
 
                 override fun onOpen(webSocket: WebSocket, response: Response) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt
index 386ab20bf..7f3666703 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt
@@ -31,6 +31,7 @@ object ImageSaver {
         val client = OkHttpClient.Builder().build()
 
         val request = Request.Builder()
+            .header("User-Agent", "Amethyst")
             .get()
             .url(url)
             .build()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
index e2fcf31b1..8e23f66a6 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
@@ -43,8 +43,9 @@ object ImageUploader {
             .build()
 
         val request: Request = Request.Builder()
-            .url("https://api.imgur.com/3/image")
             .header("Authorization", "Client-ID e6aea87296f3f96")
+            .header("User-Agent", "Amethyst")
+            .url("https://api.imgur.com/3/image")
             .post(requestBody)
             .build()