From c52d231435bc453463de40d770f5978890ead57c Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Wed, 24 May 2023 17:45:14 +0200
Subject: [PATCH] 6.4.0-alpha.2 version.

---
 CHANGELOG.md                                        |  4 +++-
 package-lock.json                                   |  4 ++--
 package.json                                        |  2 +-
 .../mod_s2s_peertubelivechat.lua                    | 13 +++++++------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f37c238f..85c6788c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 6.4.0-alpha.1
+## 6.4.0-alpha.2
 
 ### New Features
 
@@ -14,6 +14,8 @@ TODO?: mod_s2s_peertubelivechat: dont allow to connect to remote server that are
 TODO: when sanitizing remote chat endpoint, check that the domain is the same as the video domain (or is room.videodomain.tld).
 TODO: outgoing s2s connection have a session.secure=true hardcoded. Should not.
 TODO: only compatible with Prosody 0.12.x. So it should be documented for people using «system Prosody». And i should fix the ARM AppImage.
+TODO: it seems that in some case A->B can be Websocket, and B->A direct S2S. Check if this is fine. And maybe we can optimise some code, by allowing directS2S event if current server dont accept it.
+TODO: alpha.2 version force Websocket S2S when available, even if s2s is possible. Revert this before releasing.
 
 ### Minor changes and fixes
 
diff --git a/package-lock.json b/package-lock.json
index daf0c5b0..9e0a0896 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "peertube-plugin-livechat",
-  "version": "6.4.0-alpha.1",
+  "version": "6.4.0-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "peertube-plugin-livechat",
-      "version": "6.4.0-alpha.1",
+      "version": "6.4.0-alpha.2",
       "license": "AGPL-3.0",
       "dependencies": {
         "async": "^3.2.2",
diff --git a/package.json b/package.json
index dddc5e25..99268896 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-livechat",
   "description": "PeerTube plugin livechat: offers a way to embed a chat system into Peertube.",
-  "version": "6.4.0-alpha.1",
+  "version": "6.4.0-alpha.2",
   "license": "AGPL-3.0",
   "author": {
     "name": "John Livingston",
diff --git a/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua b/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
index a7b47cea..7901840f 100644
--- a/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
+++ b/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
@@ -10,12 +10,13 @@ function discover_websocket_s2s(event)
 	local to_host = event.to_host;
   module:log("debug", "Searching websocket s2s for remote host %s", to_host);
 
-	local f_s2s = io.open(path.join(server_infos_dir, to_host, 's2s'), "r");
-	if f_s2s ~= nil then
-		io.close(f_s2s);
-		module:log("debug", "Remote host is a known Peertube %s that has s2s activated, we will let legacy s2s module handle the connection", to_host);
-		return;
-	end
+	-- FIXME: this was commented for the 6.4.0-alpha2, to test ws s2s. Revert before releasing.
+	-- local f_s2s = io.open(path.join(server_infos_dir, to_host, 's2s'), "r");
+	-- if f_s2s ~= nil then
+	-- 	io.close(f_s2s);
+	-- 	module:log("debug", "Remote host is a known Peertube %s that has s2s activated, we will let legacy s2s module handle the connection", to_host);
+	-- 	return;
+	-- end
 
 	local f_ws_proxy = io.open(path.join(server_infos_dir, to_host, 'ws-s2s'), "r");
 	if f_ws_proxy == nil then