Resolve merge conflict.

3 years ago · 5dbc382d41
parent 9c2527bc81 c17f1c55f1
commit 5dbc382d41
4 changed files with 47 additions and 4 deletions
--- a/output/styles2.css
+++ b/output/styles2.css
@ -110,7 +110,7 @@ footer nav a {
 .protocol-indicator {
 	display: inline-block;
 	font-family: monospace;
-	border-radius: 3px;
+	border-radius: 4px;
 	padding: .25em .05em;
 	width: 6ch;
 	text-align: center;
--- a/sites/+components/qr_modals.php
+++ b/sites/+components/qr_modals.php
@ -1,10 +1,32 @@
 <?php
+	/*
+	 * @Deprecated
+	 */
 	function room_qr_code_cached($room_id) {
 		global $QR_CODES;
 		return "$QR_CODES/$room_id.png";
 	}

-	 /*
+	/*
+	 * Takes join URL and derives the invite.png path from it
+	 */
+	function room_qr_code_native($join_url) {
+		// Ex.: https://open.getsession.org/session?public_key=[...]
+		// Goal: https://open.getsession.org/r/session/invite.png
+		// Note: No @legacy support (Ex.: https://reccacon.com/view/Ukraine/invite.png)
+		// TODO: How does this behave with unreliable connections to Chinese servers?
+		$exploded = explode("/", explode("?", $join_url)[0]); // everything before "?"
+		$png_url =
+			$exploded[0] . "//" .         // https://
+			$exploded[2] . "/r/" .        // open.getsession.org/r/
+			$exploded[3] . "/invite.png"; // session/invite.png
+
+//		fwrite(STDERR, "PNG URL: " . $png_url . PHP_EOL);
+		return $png_url;
+	}
+
+	/*
+	 * @Deprecated
 	 * Use Google API to generate QR codes and encode them as base64
 	 */
 	function base64_qr_code($room_id, $join_url, $size = "512x512") {
@ -28,7 +50,7 @@
 		return base64_encode($png);
 	}
 	
-	file_exists($QR_CODES) or mkdir($QR_CODES, 0700);
+	// file_exists($QR_CODES) or mkdir($QR_CODES, 0700); // @Deprecated
 ?>

 <div id="modal-container">
@ -38,10 +60,20 @@
 			<span class="qr-code-modal-close" onclick='hideQRModal("<?=$id?>")'>
 				&times;
 			</span>
+			<!--
 			<img
 				src="data:image/png;base64,<?=base64_qr_code($id, $room->join_link)?>"
 				alt="Community join link encoded as QR code"
 				class="qr-code"
+				loading="lazy"
+			>
+			-->
+			<img
+				src="<?=room_qr_code_native($room->join_link)?>"
+				alt="Community join link encoded as QR code"
+				class="qr-code"
+				loading="lazy"
+				referrerpolicy="no-referrer"
 			>
 		</div>
 	</div>
--- a/sites/+instructions/Czech.txt
+++ b/sites/+instructions/Czech.txt
@ -0,0 +1,11 @@
+Na mobilu:
+
+- Klikněte na tlačítko Copy v kolonce Join URL.
+- Otevřete Session, klepněte na tlačítko plus a vyberte "Připojit se ke komunitě".
+- Klepněte na pole "Zadejte adresu komunity", vložte adresu zkopírovanou v prvním kroku a klepněte na "Připojit se".
+
+Na mobilu při prohlížení této stránky na stolním PC:
+
+- Na PC Klikněte na tlačítko QR kódu u vámi vybrané komunity.
+- Otevřete Session, klepněte na tlačítko plus a vyberte "Připojit se ke komunitě".
+- Vyberte "Skenovat QR kód" v horní části a namiřte kameru telefonu na QR kód.
--- a/sites/index.php
+++ b/sites/index.php
@ -14,7 +14,7 @@
 		<?php include "+components/page-head.php" ?>

 		<link rel="stylesheet" href="styles2.css">
-		<script type="module" src="main.js" defer></script>
+		<script type="module" src="main.js"></script>
 		<title>Self-updating list of active Session communities</title>
 	</head>
 	<body onload="onLoad(<?php echo $timestamp ?>)">