fix

Volco · Apr 14, 2024 · 694b43b · 694b43b
1 parent d9bf016
commit 694b43b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/play.pokemonshowdown.com/js/client.js b/play.pokemonshowdown.com/js/client.js
@@ -291,14 +291,24 @@ function toId() {
 				encodeURIComponent(toUserid(name)) +
 				//'&challengekeyid=' + encodeURIComponent(this.challstr.charAt(0)) +
 				'&challenge=' + encodeURIComponent(this.challstr);
-				$.post('https://play.pokemonshowdown.com/~~dawn/action.php', {
+				// $.post('https://play.pokemonshowdown.com/~~dawn/action.php', {
+				// 	act: 'getassertion',
+				// 	userid: userid,
+				// 	challstr: this.challstr,
+				// 	sid: 'hi',
+				// }, function (data) {
+				// 	self.finishRename(name, data);
+				// });
+				var messageData = 'S' + JSON.stringify({
 					act: 'getassertion',
 					userid: userid,
 					challstr: this.challstr,
 					sid: 'hi',
-				}, function (data) {
-					self.finishRename(name, data);
-				});			
+				  });
+
+				  // Send the message to the iframe's contentWindow
+				  var pokemonIframe = document.getElementById('pokemon-iframe').contentWindow;
+				  pokemonIframe.postMessage(messageData, 'https:\/\/dawn.psim.us');		
 			} else {
 				app.send('/trn ' + name);
 			}

diff --git a/play.pokemonshowdown.com/js/storage.js b/play.pokemonshowdown.com/js/storage.js
@@ -369,7 +369,7 @@ Storage.initPrefs = function () {
 	if (document.location.hostname !== Config.routes.client) {
 		$(
 			'<iframe src="https://' + Config.routes.client + '/crossdomain.php?host=' +
-			encodeURIComponent('dawn.psim.us') +
+			encodeURIComponent(document.location.hostname) +
 			'&path=' + encodeURIComponent(document.location.pathname.substr(1)) +
 			'&protocol=' + encodeURIComponent(document.location.protocol) +
 			'" style="display: none;"></iframe>'