Skip to content

Commit 8170093

Browse files
committed
Rename 'plaintextproxy' to 'homeserver-url'
Pantalaimon/proxies are not the only use-case for not using automatic discovery.
1 parent ea1f134 commit 8170093

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Two notes on this screenshot:
7878
* no SSL/TLS
7979
* SASL username: your full matrix ID (`user:homeserver.example.org`)
8080
* SASL password: your matrix password
81+
* (Optional / advanced configuration) If you cannot use homeserver URL discovery, configure `homeserver-url=https://homeserver.example.org` as your IRC client's GECOS/"real name"
8182

8283
See below for extra instructions to work with web clients.
8384

@@ -87,7 +88,7 @@ See `INSTALL.md` for a more production-oriented guide.
8788

8889
Matrix2051 does not support Matrix's end-to-end encryption (E2EE), but can optionally be used with [Pantalaimon](https://github.com/matrix-org/pantalaimon).
8990

90-
To do so, setup Pantalaimon locally, and configure `plaintextproxy=http://localhost:8009` as your IRC client's GECOS/"real name".
91+
To do so, setup Pantalaimon locally, and configure `homeserverurl=http://localhost:8009` as your IRC client's GECOS/"real name".
9192

9293
## Architecture
9394

lib/irc/handler.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,11 @@ defmodule M51.IrcConn.Handler do
441441
{:ok, {local_name, hostname}} ->
442442
user_id = authcid
443443

444+
# Keep deprecated alias "plaintextproxy" that was used back when
445+
# this was only meant to be used with Pantalaimon
444446
proxy =
445447
case Regex.named_captures(
446-
~R(plaintextproxy=(?<url>https?://\S*\)),
448+
~R((plaintextproxy|homeserver-url)=(?<url>https?://\S*\)),
447449
M51.IrcConn.State.gecos(state) || ""
448450
) do
449451
nil -> nil

0 commit comments

Comments
 (0)