SomeGuy
/
sessioncommunities.online
Archived
1
0
Fork 1
Code Issues 13 Pull Requests 3 Activity

Increase timeouts slightly to hopefully fix preview link timeout.

Browse Source
pull/1/head
mdPlusPlus 3 years ago
parent 6dacb3c017
commit 829011bd72
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape Escape View File

@ -6,3 +6,6 @@
# Debug HTML # Debug HTML
*.html *.html
# Debug JSON
*.json

24
get_online_session_communities.php
Unescape Escape View File

@ -8,21 +8,18 @@
// some global stuff // some global stuff
// set timeout for file_get_contents() // set timeout for file_get_contents()
ini_set('default_socket_timeout', 5); // in seconds, default is 60 ini_set('default_socket_timeout', 6); // in seconds, default is 60
// curl timeout is millisecons // curl timeout is millisecons
$curl_connecttimeout_ms = 2000; // time for initiation of the connection $curl_connecttimeout_ms = 3000; // time for initiation of the connection
$curl_timeout_ms = 5000; // max time for whole connection (incl. transfer) $curl_timeout_ms = 6000; // max time for whole connection (incl. transfer)
// do not report warnings (timeouts, SSL/TLS errors) // do not report warnings (timeouts, SSL/TLS errors)
error_reporting(E_ALL & ~E_WARNING); error_reporting(E_ALL & ~E_WARNING);
// room token regex part // room token regex part, must consist of letters, numbers, underscores, or dashes: https://github.com/oxen-io/session-pysogs/blob/dev/administration.md
$room_token_regex_part = "[0-9A-Za-z-]+"; //TODO: actually correct? $room_token_regex_part = "[0-9A-Za-z-_]+";
// regex that matches room join links like http://1.2.3.4:56789/token?public_key=0123456789abcdef
//$room_join_regex = "/https?:\/\/.+\?public_key=[0-9a-f]{64}/";
$room_join_regex = "/https?:\/\/[^\/]+\/" . $room_token_regex_part . "\?public_key=[0-9A-Fa-f]{64}/";
/* /*
* This regex uses the following components: * This regex uses the following components:
* - https?:\/\/ - This matches "http" or "https" followed by "://" * - https?:\/\/ - This matches "http" or "https" followed by "://"
@ -33,6 +30,7 @@
* This regex should match strings in the following format: * This regex should match strings in the following format:
* http(s)://[server]/[room_token]?public_key=[64_hexadecimal_digits] * http(s)://[server]/[room_token]?public_key=[64_hexadecimal_digits]
*/ */
$room_join_regex = "/https?:\/\/[^\/]+\/" . $room_token_regex_part . "\?public_key=[0-9A-Fa-f]{64}/";
/* /*
@ -552,7 +550,7 @@
* Token + shortened pubkey | Name | Description | Users | View Links(?) | Join URL * Token + shortened pubkey | Name | Description | Users | View Links(?) | Join URL
*/ */
function get_table_html($room_assignments_arr) { function get_table_html($room_assignments_arr) {
global $languages; global $languages; // language_flags.php
$shortened_pubkey_length = 4; // shorten pubkey to this length to make room token unique $shortened_pubkey_length = 4; // shorten pubkey to this length to make room token unique
// contains the info for each line of the table // contains the info for each line of the table
$ordered_table_elements = array(); $ordered_table_elements = array();
@ -575,7 +573,7 @@
$info_array = array( $info_array = array(
"name" => $room_array["name"], "name" => $room_array["name"],
"language" => $languages[$identifier], "language" => $languages[$identifier], // example: $languages["deutsch+118d"] = "🇩🇪"
"description" => $room_array["description"], "description" => $room_array["description"],
"active_users" => $room_array["active_users"], "active_users" => $room_array["active_users"],
"join_link" => $join_link "join_link" => $join_link
@ -609,6 +607,12 @@
$preview_link = $preview_link_alt; // $preview_link_alt reachable $preview_link = $preview_link_alt; // $preview_link_alt reachable
} }
} }
if(!$preview_link || $preview_link == "") {
echo("Preview link is empty. Dumping variables." . PHP_EOL);
echo("Join link: " . $join_link . PHP_EOL);
echo("Server: " . $server. PHP_EOL);
echo("Token: " . $token . PHP_EOL);
}
$active_users = $content["active_users"]; $active_users = $content["active_users"];
// test if active_users is valid // test if active_users is valid

4
helper_functions.php
Unescape Escape View File

@ -14,10 +14,12 @@
$retcode = curl_getinfo($ch, CURLINFO_HTTP_CODE); $retcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch); curl_close($ch);
// echo($url . " is " . $retcode . PHP_EOL); // echo($url . " is " . $retcode . PHP_EOL);
if ($retcode != 0) { if ($retcode != 0) {
return true; return true;
} }
else { else {
// echo($url . " is " . $retcode . PHP_EOL);
return false; return false;
} }
} }
@ -37,10 +39,12 @@
$retcode = curl_getinfo($ch, CURLINFO_HTTP_CODE); $retcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch); curl_close($ch);
// echo($url . " is " . $retcode . PHP_EOL); // echo($url . " is " . $retcode . PHP_EOL);
if ($retcode == 200) { if ($retcode == 200) {
return true; return true;
} }
else { else {
// echo($url . " is " . $retcode . PHP_EOL);
return false; return false;
} }
} }

3
language_flags.php
Unescape Escape View File

@ -236,4 +236,7 @@
$languages_efe1, $languages_efe1,
$languages_fe93 $languages_fe93
); );
// $languages_json = json_encode($languages);
// file_put_contents("languages.json", $languages_json);
?> ?>