diff --git a/.prettierrc b/.prettierrc index d121ded..8c30a9d 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,7 +1,7 @@ { "singleQuote": true, "semi": true, - "trailingComma": "es5", + "trailingComma": "none", "tabWidth": 2, "printWidth": 90, "arrowParens": "avoid", diff --git a/src/constants.ts b/src/constants.ts index 2843a68..6d25c5d 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -18,7 +18,7 @@ export const Constants = { 'include_ext_media_color=true', 'include_ext_media_availability=true', 'include_ext_sensitive_media_warning=true', - 'simple_quoted_tweet=true', + 'simple_quoted_tweet=true' ].join('&'), BASE_HEADERS: { 'sec-ch-ua': `".Not/A)Brand";v="99", "Google Chrome";v="${fakeChromeVersion}", "Chromium";v="${fakeChromeVersion}"`, @@ -36,11 +36,11 @@ export const Constants = { 'Sec-Fetch-Dest': `empty`, 'Referer': `https://twitter.com/`, 'Accept-Encoding': `gzip, deflate, br`, - 'Accept-Language': `en`, + 'Accept-Language': `en` }, RESPONSE_HEADERS: { 'content-type': 'text/html;charset=UTF-8', - "x-powered-by": 'Black Magic', + 'x-powered-by': 'Black Magic' // 'cache-control': 'max-age=1' }, DEFAULT_COLOR: '#10A3FF' diff --git a/src/fetch.ts b/src/fetch.ts index dd0cafc..0efa96f 100644 --- a/src/fetch.ts +++ b/src/fetch.ts @@ -5,7 +5,7 @@ export const fetchUsingGuest = async (status: string): Promise -{headers}`, +{headers}` }; diff --git a/src/palette.ts b/src/palette.ts index 8e95825..484800a 100644 --- a/src/palette.ts +++ b/src/palette.ts @@ -1,16 +1,13 @@ - - -import { Constants } from "./constants"; +import { Constants } from './constants'; // https://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb const componentToHex = (component: number) => { - let hex = component.toString(16); - return hex.length === 1 ? "0" + hex : hex; - } - -const rgbToHex = (r: number, g: number, b: number) => -`#${componentToHex(r)}${componentToHex(g)}${componentToHex(b)}`; + let hex = component.toString(16); + return hex.length === 1 ? '0' + hex : hex; +}; +const rgbToHex = (r: number, g: number, b: number) => + `#${componentToHex(r)}${componentToHex(g)}${componentToHex(b)}`; export const colorFromPalette = (palette: MediaPlaceholderColor[]) => { for (let i = 0; i < palette.length; i++) { @@ -25,4 +22,4 @@ export const colorFromPalette = (palette: MediaPlaceholderColor[]) => { } return Constants.DEFAULT_COLOR; -} \ No newline at end of file +}; diff --git a/src/poll.ts b/src/poll.ts index 590b7cb..6ca6372 100644 --- a/src/poll.ts +++ b/src/poll.ts @@ -8,16 +8,19 @@ export const calculateTimeLeft = (date: Date) => { const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60)); const seconds = Math.floor((diff % (1000 * 60)) / 1000); return { days, hours, minutes, seconds }; -} +}; export const calculateTimeLeftString = (date: Date) => { const { days, hours, minutes, seconds } = calculateTimeLeft(date); const daysString = days > 0 ? `${days} ${days === 1 ? 'day left' : 'days left'}` : ''; - const hoursString = hours > 0 ? `${hours} ${hours === 1 ? 'hour left' : 'hours left'}` : ''; - const minutesString = minutes > 0 ? `${minutes} ${minutes === 1 ? 'minute left' : 'minutes left'}` : ''; - const secondsString = seconds > 0 ? `${seconds} ${seconds === 1 ? 'second left' : 'seconds left'}` : ''; + const hoursString = + hours > 0 ? `${hours} ${hours === 1 ? 'hour left' : 'hours left'}` : ''; + const minutesString = + minutes > 0 ? `${minutes} ${minutes === 1 ? 'minute left' : 'minutes left'}` : ''; + const secondsString = + seconds > 0 ? `${seconds} ${seconds === 1 ? 'second left' : 'seconds left'}` : ''; return daysString || hoursString || minutesString || secondsString || 'Final results'; -} +}; export const renderPoll = async (card: TweetCard): Promise => { let str = '\n\n'; @@ -29,22 +32,34 @@ export const renderPoll = async (card: TweetCard): Promise => { let totalVotes = 0; let timeLeft = ''; - if (typeof values !== "undefined" && typeof values.end_datetime_utc !== "undefined") { + if (typeof values !== 'undefined' && typeof values.end_datetime_utc !== 'undefined') { const date = new Date(values.end_datetime_utc.string_value); timeLeft = calculateTimeLeftString(date); } - if (typeof values !== "undefined" && typeof values.choice1_count !== "undefined" && typeof values.choice2_count !== "undefined") { - choices[values.choice1_label?.string_value || ''] = parseInt(values.choice1_count.string_value); + if ( + typeof values !== 'undefined' && + typeof values.choice1_count !== 'undefined' && + typeof values.choice2_count !== 'undefined' + ) { + choices[values.choice1_label?.string_value || ''] = parseInt( + values.choice1_count.string_value + ); totalVotes += parseInt(values.choice1_count.string_value); - choices[values.choice2_label?.string_value || ''] = parseInt(values.choice2_count.string_value); + choices[values.choice2_label?.string_value || ''] = parseInt( + values.choice2_count.string_value + ); totalVotes += parseInt(values.choice2_count.string_value); - if (typeof values.choice3_count !== "undefined") { - choices[values.choice3_label?.string_value || ''] = parseInt(values.choice3_count.string_value); + if (typeof values.choice3_count !== 'undefined') { + choices[values.choice3_label?.string_value || ''] = parseInt( + values.choice3_count.string_value + ); totalVotes += parseInt(values.choice3_count.string_value); } - if (typeof values.choice4_count !== "undefined") { - choices[values.choice4_label?.string_value || ''] = parseInt(values.choice4_count.string_value); + if (typeof values.choice4_count !== 'undefined') { + choices[values.choice4_label?.string_value || ''] = parseInt( + values.choice4_count.string_value + ); totalVotes += parseInt(values.choice4_count.string_value); } } else { @@ -65,4 +80,4 @@ ${label}  (${Math.round((votes / totalVotes || 0) * 100)}%) console.log(str); return str; -} \ No newline at end of file +}; diff --git a/src/quote.ts b/src/quote.ts index eed2628..418840f 100644 --- a/src/quote.ts +++ b/src/quote.ts @@ -1,3 +1,3 @@ export const handleQuote = (quote: TweetPartial): string | null => { return null; -} \ No newline at end of file +}; diff --git a/src/server.ts b/src/server.ts index 32acf8f..b0cdbb5 100644 --- a/src/server.ts +++ b/src/server.ts @@ -28,17 +28,17 @@ const statusRequest = async (request: any) => { const url = new URL(request.url); const userAgent = request.headers.get('User-Agent'); - if (userAgent.match(/bot/ig) !== null) { + if (userAgent.match(/bot/gi) !== null) { return new Response(await handleStatus(handle, id, parseInt(mediaNumber || 1)), { headers: { - 'content-type': 'text/html;charset=UTF-8', + 'content-type': 'text/html;charset=UTF-8' }, status: 200 }); } else { return Response.redirect(`${Constants.TWITTER_ROOT}${url.pathname}`, 302); } -} +}; router.get('/:handle/status/:id', statusRequest); router.get('/:handle/status/:id/photo/:mediaNumber', statusRequest); @@ -48,29 +48,31 @@ router.get('/:handle/statuses/:id/photo/:mediaNumber', statusRequest); router.get('/:handle/statuses/:id/video/:mediaNumber', statusRequest); router.get('/owoembed', async (request: any) => { - console.log("THE OWOEMBED HAS BEEN ACCESSED!!!!!!!!!"); - const { searchParams } = new URL(request.url) + console.log('THE OWOEMBED HAS BEEN ACCESSED!!!!!!!!!'); + const { searchParams } = new URL(request.url); let text = searchParams.get('text') || 'Twitter'; let author = searchParams.get('author') || 'dangeredwolf'; let status = searchParams.get('status') || '1547514042146865153'; - + const test = { - "author_name": decodeURIComponent(text), - "author_url": `https://twitter.com/${encodeURIComponent(author)}/status/${encodeURIComponent(status)}`, - "provider_name": Constants.BRANDING_NAME, - "provider_url": Constants.REDIRECT_URL, - "title": "Twitter", - "type": "link", - "version": "1.0" - } + author_name: decodeURIComponent(text), + author_url: `https://twitter.com/${encodeURIComponent( + author + )}/status/${encodeURIComponent(status)}`, + provider_name: Constants.BRANDING_NAME, + provider_url: Constants.REDIRECT_URL, + title: 'Twitter', + type: 'link', + version: '1.0' + }; return new Response(JSON.stringify(test), { headers: { - 'content-type': 'application/json', + 'content-type': 'application/json' }, status: 200 }); -}) +}); router.all('*', async request => { return Response.redirect(Constants.REDIRECT_URL, 307); diff --git a/src/status.ts b/src/status.ts index 8c17d22..83a7b88 100644 --- a/src/status.ts +++ b/src/status.ts @@ -1,13 +1,16 @@ -import { Constants } from "./constants"; -import { fetchUsingGuest } from "./fetch"; -import { Html } from "./html"; -import { colorFromPalette } from "./palette"; -import { renderPoll } from "./poll"; -import { handleQuote } from "./quote"; +import { Constants } from './constants'; +import { fetchUsingGuest } from './fetch'; +import { Html } from './html'; +import { colorFromPalette } from './palette'; +import { renderPoll } from './poll'; +import { handleQuote } from './quote'; -export const handleStatus = async (handle: string, status: string, mediaNumber?: number): Promise => { +export const handleStatus = async ( + handle: string, + status: string, + mediaNumber?: number +): Promise => { const conversation = await fetchUsingGuest(status); - const tweet = conversation?.globalObjects?.tweets?.[status] || {}; /* With v2 conversation API we re-add the user object ot the tweet because @@ -26,11 +29,11 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: ``, ``, ``, - ``, + `` ]; // Fallback for if Tweet did not load - if (typeof tweet.full_text === "undefined") { + if (typeof tweet.full_text === 'undefined') { headers.push( ``, `` @@ -39,7 +42,7 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: return Html.BASE_HTML.format({ lang: '', headers: headers.join(''), - tweet: JSON.stringify(tweet), + tweet: JSON.stringify(tweet) }); } @@ -48,7 +51,9 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: const screenName = user?.screen_name || ''; const name = user?.name || ''; - const mediaList = Array.from(tweet.extended_entities?.media || tweet.entities?.media || []); + const mediaList = Array.from( + tweet.extended_entities?.media || tweet.entities?.media || [] + ); let authorText = 'Twitter'; @@ -71,7 +76,10 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: text = text.replace(/ ?https\:\/\/t\.co\/\w{10}/, ''); } - if (typeof tweet.extended_entities?.media === 'undefined' && typeof tweet.entities?.media === 'undefined') { + if ( + typeof tweet.extended_entities?.media === 'undefined' && + typeof tweet.entities?.media === 'undefined' + ) { let palette = user?.profile_image_extensions_media_color?.palette; let colorOverride: string = Constants.DEFAULT_COLOR; @@ -82,7 +90,10 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: headers.push( ``, - ``, + ``, ``, ``, ``, @@ -100,30 +111,26 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: if (palette) { colorOverride = colorFromPalette(palette); } - - headers.push( - `` - ) + + headers.push(``); const processMedia = (media: TweetMedia) => { if (media.type === 'photo') { - headers.push( - `` - ); + headers.push(``); if (!pushedCardType) { headers.push(``); pushedCardType = true; } } else if (media.type === 'video') { - headers.push( - `` - ); + headers.push(``); authorText = encodeURIComponent(text); // Find the variant with the highest bitrate - let bestVariant = media.video_info?.variants?.reduce?.((a, b) => (a.bitrate || 0) > (b.bitrate || 0) ? a : b); + let bestVariant = media.video_info?.variants?.reduce?.((a, b) => + (a.bitrate || 0) > (b.bitrate || 0) ? a : b + ); headers.push( ``, ``, @@ -137,21 +144,23 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: `` ); } - } + }; let actualMediaNumber = 1; - console.log('mediaNumber', mediaNumber) - + console.log('mediaNumber', mediaNumber); /* You can specify a specific photo in the URL and we'll pull the correct one, otherwise it falls back to first */ - if (typeof mediaNumber !== "undefined" && typeof mediaList[mediaNumber - 1] !== "undefined") { - console.log(`Media ${mediaNumber} found`) + if ( + typeof mediaNumber !== 'undefined' && + typeof mediaList[mediaNumber - 1] !== 'undefined' + ) { + console.log(`Media ${mediaNumber} found`); actualMediaNumber = mediaNumber - 1; processMedia(mediaList[actualMediaNumber]); } else { - console.log(`Media ${mediaNumber} not found, ${mediaList.length} total`) + console.log(`Media ${mediaNumber} not found, ${mediaList.length} total`); /* I wish Telegram respected multiple photos in a tweet, and that Discord could do the same for 3rd party providers like us */ // media.forEach(media => processMedia(media)); @@ -159,14 +168,16 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: } if (mediaList.length > 1) { - authorText = `Photo ${(actualMediaNumber + 1)} of ${mediaList.length}`; + authorText = `Photo ${actualMediaNumber + 1} of ${mediaList.length}`; headers.push( - `` - ) + `` + ); } else { headers.push( `` - ) + ); } headers.push( @@ -175,13 +186,13 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: ); } - let quoteTweetMaybe = conversation.globalObjects?.tweets?.[tweet.quoted_status_id_str || '0'] || null; + let quoteTweetMaybe = + conversation.globalObjects?.tweets?.[tweet.quoted_status_id_str || '0'] || null; if (quoteTweetMaybe) { const quoteText = handleQuote(quoteTweetMaybe); if (quoteText) { - } } @@ -192,9 +203,15 @@ export const handleStatus = async (handle: string, status: string, mediaNumber?: /* The additional oembed is pulled by Discord to enable improved embeds. Telegram does not use this. */ - headers.push(``) + headers.push( + `` + ); - console.log(JSON.stringify(tweet)) + console.log(JSON.stringify(tweet)); /* When dealing with a Tweet of unknown lang, fall back to en */ let lang = tweet.lang === 'unk' ? 'en' : tweet.lang || 'en'; diff --git a/src/tweetTypes.ts b/src/tweetTypes.ts index ae0bd8f..4cb2efb 100644 --- a/src/tweetTypes.ts +++ b/src/tweetTypes.ts @@ -5,7 +5,7 @@ type TimelineBlobPartial = { }; users: { [userId: string]: UserPartial; - } + }; }; }; @@ -33,7 +33,7 @@ type TweetMedia = { display_url: string; expanded_url: string; ext_media_color?: { - palette?: MediaPlaceholderColor[] + palette?: MediaPlaceholderColor[]; }; id_str: string; indices: [number, number]; @@ -57,35 +57,35 @@ type TweetMedia = { }; type CardValue = { - type: 'BOOLEAN' | 'STRING', - boolean_value: boolean, - string_value: string, -} + type: 'BOOLEAN' | 'STRING'; + boolean_value: boolean; + string_value: string; +}; type TweetCard = { binding_values: { card_url: CardValue; - choice1_count?: CardValue, - choice2_count?: CardValue, - choice3_count?: CardValue, - choice4_count?: CardValue, - choice1_label?: CardValue, - choice2_label?: CardValue, - choice3_label?: CardValue, - choice4_label?: CardValue, - counts_are_final?: CardValue, - duration_minutes?: CardValue, - end_datetime_utc?: CardValue, - }, - name: string -} + choice1_count?: CardValue; + choice2_count?: CardValue; + choice3_count?: CardValue; + choice4_count?: CardValue; + choice1_label?: CardValue; + choice2_label?: CardValue; + choice3_label?: CardValue; + choice4_label?: CardValue; + counts_are_final?: CardValue; + duration_minutes?: CardValue; + end_datetime_utc?: CardValue; + }; + name: string; +}; type TweetPartial = { card?: TweetCard; conversation_id_str: string; created_at: string; // date string display_text_range: [number, number]; - entities: { urls?: TcoExpansion[], media?: TweetMedia[] }; + entities: { urls?: TcoExpansion[]; media?: TweetMedia[] }; extended_entities: { media?: TweetMedia[] }; favorite_count: number; in_reply_to_screen_name?: string; @@ -110,14 +110,14 @@ type UserPartial = { screen_name: string; profile_image_url_https: string; profile_image_extensions_media_color?: { - palette?: MediaPlaceholderColor[] + palette?: MediaPlaceholderColor[]; }; -} +}; type MediaPlaceholderColor = { rgb: { red: number; green: number; blue: number; - } -} \ No newline at end of file + }; +}; diff --git a/src/utils.ts b/src/utils.ts index 632258b..f041ce1 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -2,8 +2,8 @@ const componentToHex = (component: number) => { let hex = component.toString(16); - return hex.length === 1 ? "0" + hex : hex; -} - -export const rgbToHex = (r: number, g: number, b: number) => - `#${componentToHex(r)}${componentToHex(g)}${componentToHex(b)}`; \ No newline at end of file + return hex.length === 1 ? '0' + hex : hex; +}; + +export const rgbToHex = (r: number, g: number, b: number) => + `#${componentToHex(r)}${componentToHex(g)}${componentToHex(b)}`; diff --git a/webpack.config.js b/webpack.config.js index f6abf53..ed0bcc1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,20 +2,20 @@ const path = require('path'); module.exports = { entry: { - worker: './src/server.ts', + worker: './src/server.ts' }, output: { filename: '[name].js', - path: path.join(__dirname, 'dist'), + path: path.join(__dirname, 'dist') }, mode: 'production', resolve: { extensions: ['.ts', '.tsx', '.js'], - fallback: { util: false }, + fallback: { util: false } }, plugins: [], optimization: { - mangleExports: 'size', + mangleExports: 'size' }, module: { rules: [ @@ -23,9 +23,9 @@ module.exports = { test: /\.tsx?$/, loader: 'ts-loader', options: { - transpileOnly: true, - }, - }, - ], - }, + transpileOnly: true + } + } + ] + } };