make it work with oldtweetdeck

dimdenGD · Aug 19, 2023 · ad04b57 · ad04b57
1 parent 86bfa68
commit ad04b57
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 38 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,17 +30,4 @@ jobs:
       - run: npm ci
 
       - name: Typecheck + lint
-        run: npm test
-
-      # Runs a set of commands using the runners shell
-      - name: Publish unlisted addon to AMO
-        env:
-          FIREFOX_BETA_ID: ${{ secrets.FIREFOX_BETA_ID }}
-          AMO_API_KEY: ${{ secrets.AMO_API_KEY }}
-          AMO_API_SECRET: ${{ secrets.AMO_API_SECRET }}
-          NIGHTLY_DISCORD_WEBHOOK_TOKEN: ${{ secrets.NIGHTLY_DISCORD_WEBHOOK_TOKEN }}
-          NIGHTLY_DISCORD_WEBHOOK_ID: ${{ secrets.NIGHTLY_DISCORD_WEBHOOK_ID }}
-          NIGHTLY_DISCORD_ROLE_ID: ${{ secrets.NIGHTLY_DISCORD_ROLE_ID }}
-          NIGHTLY_TENOR_API_KEY: ${{ secrets.NIGHTLY_TENOR_API_KEY }}
-          NIGHTLY_GIPHY_API_KEY: ${{ secrets.NIGHTLY_GIPHY_API_KEY }}
-        run: npm run build:firefox-beta && npx web-ext sign --api-key="$AMO_API_KEY" --api-secret="$AMO_API_SECRET" -s dist --channel unlisted && npm run ts-node -- tools/uploadNightly.ts
+        run: npm test
diff --git a/README.md b/README.md
@@ -2,6 +2,4 @@
 
 <h1 align="center">Better TweetDeck</h1>
 
-# Intro
-
-**As of July 4th 2023, [Old TweetDeck has been unplugged, Preview is the way and will require a Verification](https://twitter.com/TwitterSupport/status/1675990712297443330). This project is thus over. Thank you for the support over the years.**
+This fork works with [OldTweetDeck](/~https://github.com/dimdenGD/OldTweetDeck)! Install the same way as you did with OldTweetDeck except get archive from [Releases page](/~https://github.com/dimdenGD/BetterTweetDeck/releases).
diff --git a/src/background.ts b/src/background.ts
@@ -72,9 +72,9 @@ browser.storage.onChanged.addListener(async (changes) => {
 });
 
 browser.runtime.onMessage.addListener(async (request: BTDMessageEvent, sender) => {
-  if (sender.url !== 'https://tweetdeck.twitter.com/') {
-    throw new Error('Message not coming from BTD');
-  }
+  // if (sender.url !== 'https://tweetdeck.twitter.com/') {
+  //   throw new Error('Message not coming from BTD');
+  // }
 
   switch (request.data.name) {
     case BTDMessages.OPEN_SETTINGS: {

diff --git a/src/content.ts b/src/content.ts
@@ -11,22 +11,21 @@ import {sendMessageToBackground} from './helpers/webExtensionHelpers';
 import {processDownloadMediaRequest} from './services/backgroundGifRequests';
 import {getValidatedSettings} from './services/backgroundSettings';
 import {injectInTD} from './services/injectInTD';
-import {rollbackToLegacy} from './services/rollbackToLegacy';
 import {setupBTDNotifications} from './services/setupBTDNotifications';
 import {setupBtdRoot} from './services/setupBTDRoot';
 import {BTDMessageOriginsEnum, BTDMessages} from './types/btdMessageTypes';
 
 (async () => {
-  const hasNewTweetDeck = document.querySelectorAll('script[src*="tweetdeck-web"]').length === 0;
-
-  if (hasNewTweetDeck) {
-    console.debug('Better TweetDeck aborted loading on TweetDeck Preview');
-    if (localStorage.getItem('STOP_ROLLBACK_TO_LEGACY') === 'true') {
-      return;
-    }
-    rollbackToLegacy();
-    return;
-  }
+  // const hasNewTweetDeck = document.querySelectorAll('script[src*="tweetdeck-web"]').length === 0;
+
+  // if (hasNewTweetDeck) {
+  //   console.debug('Better TweetDeck aborted loading on TweetDeck Preview');
+  //   if (localStorage.getItem('STOP_ROLLBACK_TO_LEGACY') === 'true') {
+  //     return;
+  //   }
+  //   rollbackToLegacy();
+  //   return;
+  // }
 
   // Inject some scripts.
   injectInTD();

diff --git a/src/helpers/communicationHelpers.ts b/src/helpers/communicationHelpers.ts
@@ -13,7 +13,7 @@ const ORIGIN_BETTER_TW = 'https://better.tw';
 
 export function isMessageEventAllowed(ev: MessageEvent) {
   const {origin, data} = ev;
-  const allowedOrigins = [ORIGIN_TWEETDECK, ORIGIN_BETTER_TW];
+  const allowedOrigins = [ORIGIN_TWEETDECK, ORIGIN_BETTER_TW, 'https://tweetdeck.dimden.dev'];
 
   if (!allowedOrigins.includes(origin)) {
     return false;
@@ -74,7 +74,7 @@ export function listenToInternalBTDMessage(
         requestId: data.requestId,
         isReponse: true,
       } as BTDMessageEventData,
-      ORIGIN_TWEETDECK
+      '*'
     );
   };
 
@@ -114,7 +114,7 @@ export function sendInternalBTDMessage(msg: Omit<BTDMessageEventData, 'requestId
         ...msg,
         requestId,
       } as BTDMessageEventData,
-      ORIGIN_TWEETDECK
+      '*'
     );
   });
 }
diff --git a/tools/manifests/chrome.js b/tools/manifests/chrome.js
@@ -17,11 +17,11 @@ module.exports = {
   web_accessible_resources: [
     {
       resources: common.web_accessible_resources,
-      matches: ['*://tweetdeck.twitter.com/*'],
+      matches: ['*://tweetdeck.twitter.com/*', '*://tweetdeck.dimden.dev/*'],
     },
   ],
   externally_connectable: {
-    matches: ['*://tweetdeck.twitter.com/*'],
+    matches: ['*://tweetdeck.twitter.com/*', '*://tweetdeck.dimden.dev/*'],
   },
   browser_action: undefined,
   action: undefined,

diff --git a/tools/manifests/common.js b/tools/manifests/common.js
@@ -26,9 +26,10 @@ module.exports = {
   icons,
   content_scripts: [
     {
-      matches: ['*://tweetdeck.twitter.com/*'],
+      matches: ['*://tweetdeck.twitter.com/*', '*://tweetdeck.dimden.dev/*'],
       js: ['build/content.js'],
       run_at: 'document_end',
+      all_frames: true,
     },
   ],
   background: {

diff --git a/tools/manifests/commonHosts.js b/tools/manifests/commonHosts.js
@@ -4,4 +4,8 @@ const commonConnectHosts = (exports.commonConnectHosts = [
   'https://*.twimg.com',
 ]);
 
-exports.commonHosts = ['*://tweetdeck.twitter.com/*', ...commonConnectHosts.map((h) => `${h}/*`)];
+exports.commonHosts = [
+  '*://tweetdeck.twitter.com/*',
+  '*://tweetdeck.dimden.dev/*',
+  ...commonConnectHosts.map((h) => `${h}/*`),
+];