chore(release): prepare Haven v1.1.0

Author: aaccioly

.dockerignore

@@ -30,7 +30,6 @@ CHAT_RELAY_ICON="https://i.nostr.build/6G6wW.gif"
 CHAT_RELAY_WOT_DEPTH=3
 CHAT_RELAY_WOT_REFRESH_INTERVAL_HOURS=24
 CHAT_RELAY_MINIMUM_FOLLOWERS=3
-CHAT_RELAY_ALLOW_KIND_4=false # NIP-04 is deprecated in favour of NIP-17 because kind 4 DMs leak metadata
 
 ## Chat Relay Rate Limiters
 CHAT_RELAY_EVENT_IP_LIMITER_TOKENS_PER_INTERVAL=50
@@ -79,7 +78,7 @@ INBOX_RELAY_CONNECTION_RATE_LIMITER_MAX_TOKENS=9
 ## Import Settings
 IMPORT_START_DATE="2023-01-20"
 IMPORT_QUERY_INTERVAL_SECONDS=600
-IMPORT_OWNER_NOTES_FETCH_TIMEOUT_SECONDS=30
+IMPORT_OWNER_NOTES_FETCH_TIMEOUT_SECONDS=60
 IMPORT_TAGGED_NOTES_FETCH_TIMEOUT_SECONDS=120
 IMPORT_SEED_RELAYS_FILE="relays_import.json"
 
@@ -98,7 +97,7 @@ S3_BUCKET_NAME="backups"
 BLASTR_RELAYS_FILE="relays_blastr.json"
 
 ## WOT Settings
-WOT_FETCH_TIMEOUT_SECONDS=30
+WOT_FETCH_TIMEOUT_SECONDS=60
 
 ## LOGGING
 HAVEN_LOG_LEVEL="INFO" # DEBUG, INFO, WARNING or ERROR

.env.example

@@ -276,51 +276,6 @@ Once everything is set up, the relay will be running on `localhost:3355` with th
 - `localhost:3355/chat`
 - `localhost:3355/inbox`
 
-## Start the Project with Docker Compose
-
-To start the project using Docker Compose, follow these steps:
-
-1. Ensure Docker and Docker Compose are installed on your system.
-2. Navigate to the project directory.
-3. Ensure the `.env` file is present in the project directory and has the necessary environment variables set.
-4. You'll also need to expose ports 80 and 443 to the internet and set up your DNS A and AAAA (if you are using IPv6)
-   records to point to your server's IP address.
-5. (Optional) You can also change the paths of the `blossom`, `db`, and `templates` folders in the `compose.yml` file.
-
-   ```yaml
-   volumes:
-      - ./blossom:/haven/blossom # only change the left side before the colon
-      - ./db:/haven/db
-      - ./templates:/haven/templates
-   ```
-6. (Optional) Nginx is pre-configured to reject uploads larger than 100MB. If you want to change this, modify the `client_max_body_size`
-   directive in the `nginx/haven_proxy.conf file`.
-
-   ```nginx
-   client_max_body_size 0;
-   ```
-
-7. Run the following command:
-
-   ```sh
-   # in foreground
-   docker compose up --build
-   # in background
-   docker compose up --build -d
-   ```
-
-8. For updating the relay, run the following commands:
-
-   ```sh
-   git pull
-   docker compose down
-   docker compose build
-   # in foreground
-   docker compose up
-   # in background
-   docker compose up -d
-   ```
-
 ## Database
 
 Haven currently supports [BadgerDB](https://github.com/dgraph-io/badger) and [LMDB](https://www.symas.com/mdb) as embedded

Dockerfile

@@ -51,7 +51,6 @@ type Config struct {
 	ChatRelayWotDepth                    int        `json:"chat_relay_wot_depth"`
 	ChatRelayWotRefreshIntervalHours     int        `json:"chat_relay_wot_refresh_interval_hours"`
 	ChatRelayMinimumFollowers            int        `json:"chat_relay_minimum_followers"`
-	ChatRelayAllowKind4          	     bool   	`json:"chat_relay_allow_kind_4"`
 	OutboxRelayName                      string     `json:"outbox_relay_name"`
 	OutboxRelayNpub                      string     `json:"outbox_relay_npub"`
 	OutboxRelayDescription               string     `json:"outbox_relay_description"`
@@ -100,7 +99,6 @@ func loadConfig() Config {
 		ChatRelayWotDepth:                    getEnvInt("CHAT_RELAY_WOT_DEPTH", 0),
 		ChatRelayWotRefreshIntervalHours:     getEnvInt("CHAT_RELAY_WOT_REFRESH_INTERVAL_HOURS", 0),
 		ChatRelayMinimumFollowers:            getEnvInt("CHAT_RELAY_MINIMUM_FOLLOWERS", 0),
-		ChatRelayAllowKind4:                  getEnvBool("CHAT_RELAY_ALLOW_KIND_4", false),
 		OutboxRelayName:                      getEnv("OUTBOX_RELAY_NAME"),
 		OutboxRelayNpub:                      getEnv("OUTBOX_RELAY_NPUB"),
 		OutboxRelayDescription:               getEnv("OUTBOX_RELAY_DESCRIPTION"),

README.md

@@ -257,10 +257,6 @@ func initRelays() {
 		nostr.KindSimpleGroupRoles,
 	}
 
-	if config.ChatRelayAllowKind4 {
-		allowedKinds = append(allowedKinds, nostr.KindEncryptedDirectMessage)
-	}
-
 	chatRelay.RejectEvent = append(chatRelay.RejectEvent, func(ctx context.Context, event *nostr.Event) (bool, string) {
 		for _, kind := range allowedKinds {
 			if event.Kind == kind {
@@ -437,7 +433,7 @@ func initRelays() {
 			return true, "you must be in the web of trust to post to this relay"
 		}
 
-		if event.Kind == nostr.KindEncryptedDirectMessage && !config.ChatRelayAllowKind4 {
+		if event.Kind == nostr.KindEncryptedDirectMessage {
 			return true, "only gift wrapped DMs are supported"
 		}