From c72e3ec166f4dc4c8c166ae75a446794926f235c Mon Sep 17 00:00:00 2001 From: dangered wolf Date: Thu, 17 Aug 2023 01:36:22 -0400 Subject: [PATCH] Temp note about fixupx.com --- motd.json | 2 +- package-lock.json | 30 +++++++++++++++--------------- src/embed/status.ts | 2 ++ src/server.ts | 4 ++++ src/strings.ts | 3 ++- src/types/types.d.ts | 1 + 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/motd.json b/motd.json index 7c504e4..fef6280 100644 --- a/motd.json +++ b/motd.json @@ -1,3 +1,3 @@ { - "FixTweet - Recovering from API woes": "https://github.com/FixTweet/FixTweet/issues/333" + "FixTweet - Recovering from API woes": "https://github.com/FixTweet/FixTweet" } diff --git a/package-lock.json b/package-lock.json index 6120e98..381bc14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -107,9 +107,9 @@ "dev": true }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -150,9 +150,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -4703,9 +4703,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -5578,9 +5578,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -7859,9 +7859,9 @@ "dev": true }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" diff --git a/src/embed/status.ts b/src/embed/status.ts index 1a34ca9..adbc480 100644 --- a/src/embed/status.ts +++ b/src/embed/status.ts @@ -286,6 +286,8 @@ export const handleStatus = async ( /* Notice that user is using deprecated domain */ if (flags?.deprecated) { siteName = Strings.DEPRECATED_DOMAIN_NOTICE; + } else if (!flags?.isXDomainTemp) { + siteName = Strings.X_DOMAIN_NOTICE; } /* Push basic headers relating to author, Tweet text, and site name */ diff --git a/src/server.ts b/src/server.ts index 276b7dc..149c33b 100644 --- a/src/server.ts +++ b/src/server.ts @@ -68,6 +68,10 @@ const statusRequest = async ( flags.deprecated = true; } + if (/fixup/g.test(url.hostname)) { + flags.isXDomainTemp = true; + } + /* Check if request is to api.fxtwitter.com, or the tweet is appended with .json Note that unlike TwitFix, FixTweet will never generate embeds for .json, and in fact we only support .json because it's what people using TwitFix API would diff --git a/src/strings.ts b/src/strings.ts index 96ffcc0..61470b2 100644 --- a/src/strings.ts +++ b/src/strings.ts @@ -209,5 +209,6 @@ Disallow: /owoembed Disallow: /owoembed/ Allow: /watch?v=dQw4w9WgXcQ -# 0100011101101111011011110110010000100000011000100110111101110100` +# 0100011101101111011011110110010000100000011000100110111101110100`, + X_DOMAIN_NOTICE: 'FixTweet - 🆕 Fix x.com links with fixupx.com!' }; diff --git a/src/types/types.d.ts b/src/types/types.d.ts index fc868f8..4aea8bc 100644 --- a/src/types/types.d.ts +++ b/src/types/types.d.ts @@ -7,6 +7,7 @@ type InputFlags = { api?: boolean; deprecated?: boolean; textOnly?: boolean; + isXDomainTemp?: boolean; }; interface StatusResponse {