maybe fix endless load

dimdenGD · Apr 1, 2024 · e6bf845 · e6bf845
1 parent d15b73b
commit e6bf845
Show file tree

Hide file tree

Showing 29 changed files with 90 additions and 233 deletions.
diff --git a/layouts/bookmarks/index.html b/layouts/bookmarks/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/bookmarks/script.js b/layouts/bookmarks/script.js
@@ -99,7 +99,7 @@ setTimeout(async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/history/index.html b/layouts/history/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box" hidden>
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/history/script.js b/layouts/history/script.js
@@ -74,7 +74,7 @@ setTimeout(async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/home/index.html b/layouts/home/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/home/script.js b/layouts/home/script.js
@@ -412,7 +412,7 @@ setTimeout(async () => {
 
     // weird bug
     if(!document.getElementById('new-tweets')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         let lastNewTweetPress = Date.now();
@@ -438,7 +438,7 @@ setTimeout(async () => {
             timeline.dataToUpdate = [];
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/itl/index.html b/layouts/itl/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/itl/script.js b/layouts/itl/script.js
@@ -159,7 +159,7 @@ setTimeout(async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/lists/index.html b/layouts/lists/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text">

diff --git a/layouts/lists/script.js b/layouts/lists/script.js
@@ -356,14 +356,14 @@ setTimeout(async () => {
     }
     // weird bug
     if(!document.getElementById('wtf-refresh')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         document.getElementById('wtf-refresh').addEventListener('click', async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/notifications/index.html b/layouts/notifications/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/notifications/script.js b/layouts/notifications/script.js
@@ -149,14 +149,14 @@ setTimeout(async () => {
 
     // weird bug
     if(!document.getElementById('wtf-refresh')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         document.getElementById('wtf-refresh').addEventListener('click', async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/profile/index.html b/layouts/profile/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span><br>

diff --git a/layouts/profile/script.js b/layouts/profile/script.js
@@ -1810,7 +1810,7 @@ setTimeout(async () => {
 
     // weird bug
     if(!document.getElementById('new-tweets')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         document.getElementById('new-tweets').addEventListener('click', () => {
@@ -1821,7 +1821,7 @@ setTimeout(async () => {
             renderTimeline();
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/search/index.html b/layouts/search/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/search/script.js b/layouts/search/script.js
@@ -296,14 +296,14 @@ setTimeout(async () => {
 
     // weird bug
     if(!document.getElementById('wtf-refresh')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         document.getElementById('wtf-refresh').addEventListener('click', async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/settings/index.html b/layouts/settings/index.html
@@ -8,7 +8,7 @@
     <link rel="preconnect" href="https://twitter.com">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/settings/script.js b/layouts/settings/script.js
@@ -218,7 +218,7 @@ setTimeout(async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/topics/index.html b/layouts/topics/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box" hidden>
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/topics/script.js b/layouts/topics/script.js
@@ -116,14 +116,14 @@ setTimeout(async () => {
 
     // weird bug
     if(!document.getElementById('wtf-refresh')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         document.getElementById('wtf-refresh').addEventListener('click', async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/tweet/index.html b/layouts/tweet/index.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://dimden.dev">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box">
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/tweet/script.js b/layouts/tweet/script.js
@@ -783,14 +783,14 @@ setTimeout(async () => {
     }
     // weird bug
     if(!document.getElementById('wtf-refresh')) {
-        return setTimeout(() => location.reload(), 1500);
+        return // setTimeout(() => location.reload(), 1500);
     }
     try {
         document.getElementById('wtf-refresh').addEventListener('click', async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/layouts/unfollows/index.html b/layouts/unfollows/index.html
@@ -8,7 +8,7 @@
     <link rel="preconnect" href="https://twitter.com">
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 </head>
-<body>
+<body id="injected-body">
     <div id="loading-box" hidden>
         <div id="loading-box-container">
             <span id="loading-box-text"></span>

diff --git a/layouts/unfollows/script.js b/layouts/unfollows/script.js
@@ -133,7 +133,7 @@ setTimeout(async () => {
             renderDiscovery(false);
         });
     } catch(e) {
-        setTimeout(() => location.reload(), 1500);
+        // setTimeout(() => location.reload(), 1500);
         console.error(e);
         return;
     }

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Old Twitter Layout (2024)",
   "description": "__MSG_ext_description__",
-  "version": "1.8.3.3",
+  "version": "1.8.3.4",
   "manifest_version": 3,
   "homepage_url": "https://github.com/dimdenGD/OldTwitter",
   "background": {
@@ -78,7 +78,7 @@
     {
       "matches": ["https://twitter.com/*"],
       "exclude_matches": ["https://twitter.com/*?*newtwitter=true*", "https://twitter.com/settings/download_your_data", "https://twitter.com/i/flow/login*", "https://twitter.com/i/tweetdeck", "https://twitter.com/i/communitynotes", "https://twitter.com/i/broadcasts/*"],
-      "js": ["scripts/blockBeforeInject.js", "scripts/config.js", "scripts/helpers.js", "scripts/apis.js", "scripts/injection.js"],
+      "js": ["scripts/blockBeforeInject.js", "scripts/config.js", "scripts/helpers.js", "scripts/apis.js", "scripts/twchallenge.js", "scripts/injection.js"],
       "css": ["libraries/viewer.min.css"],
       "all_frames": true,
       "run_at": "document_start"