fix tweet page and tweet replies no longer working (#83)

* fix tweet page and tweet replies no longer working * bump manifest versions to 0.2.5 * the error I added for testing was still there
kheina-com · May 8, 2023 · e902fbe · e902fbe
1 parent 2d093d6
commit e902fbe
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 47 deletions.
diff --git a/assets/error.png b/assets/error.png
diff --git a/firefox-manifest.json b/firefox-manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "Blue Blocker",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"description": "Blocks all Twitter Blue verified users on twitter.com",
 	"icons": {
 		"128": "assets/icon-128.png"

diff --git a/injected/inject.js b/injected/inject.js
@@ -1,6 +1,6 @@
-const RequestRegex = /^https:\/\/(?:\w+\.)?twitter.com\/[\w\/\.]+\/(HomeLatestTimeline|HomeTimeline|UserTweets|timeline\/home\.json|TweetDetail|search\/typeahead\.json|search\/adaptive\.json)(?:$|\?)/;
-
 (function(xhr) {
+	const RequestRegex = /^https:\/\/(?:\w+\.)?twitter.com\/[\w\/\.\-\_\=]+\/(HomeLatestTimeline|HomeTimeline|UserTweets|timeline\/home\.json|TweetDetail|search\/typeahead\.json|search\/adaptive\.json)(?:$|\?)/;
+
 	let XHR = XMLHttpRequest.prototype;
 	let open = XHR.open;
 	let send = XHR.send;

diff --git a/injected/toasts.css b/injected/toasts.css
@@ -44,6 +44,13 @@
 	box-shadow: 0 2px 3px 1px var(--shadowcolor);
 	min-height: calc(2em + 4px);
 }
+#injected-blue-block-toasts .toast.error {
+	background: url('../assets/error.png') var(--bg1color);
+	background-repeat: no-repeat;
+	background-size: 2.5em;
+	background-position-x: 1em;
+	background-position-y: center;
+}
 
 #injected-blue-block-toasts .toast a,
 #injected-blue-block-toasts .toast a:active,

diff --git a/makefile b/makefile
@@ -12,6 +12,7 @@ firefox:
 	zip "blue-blocker-firefox-${VERSION}.zip" \
 		assets/icon-128.png \
 		assets/icon.png \
+		assets/error.png \
 		injected/* \
 		models/* \
 		parsers/* \
@@ -31,6 +32,7 @@ chrome:
 	zip "blue-blocker-chrome-${VERSION}.zip" \
 		assets/icon-128.png \
 		assets/icon.png \
+		assets/error.png \
 		injected/* \
 		models/* \
 		parsers/* \

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 3,
 	"name": "Blue Blocker",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"description": "Blocks all Twitter Blue verified users on twitter.com",
 	"icons": {
 		"128": "assets/icon-128.png"

diff --git a/models/block_queue.js b/models/block_queue.js
@@ -69,4 +69,13 @@ export class BlockQueue {
 		this.releaseCriticalPoint();
 		return item;
 	}
+	async clear() {
+		await this.getCriticalPoint();
+		const items = await this.storage.get({ BlockQueue: [] });
+		if (!items.BlockQueue || items.BlockQueue.length === 0) {
+			return;
+		}
+		await this.storage.set({ BlockQueue: [] });
+		this.releaseCriticalPoint();
+	}
 }
diff --git a/parsers/instructions.js b/parsers/instructions.js
@@ -82,17 +82,13 @@ export function ParseTimelineTweet(tweet, headers) {
 export function HandleInstructionsResponse(e, body) {
 	// pull the "instructions" object from the tweet
 	let instructions = body;
-
-	try {
-		for (const key of InstructionsPaths[e.detail.parsedUrl[1]]) {
-			instructions = instructions[key];
-		}
-	}
-	catch (e) {
-		console.error(logstr, "failed to parse response body for instructions object", e, body);
-		return;
+
+	for (const key of InstructionsPaths[e.detail.parsedUrl[1]]) {
+		instructions = instructions[key];
 	}
 
+	console.debug(logstr, "parsed instructions path:", instructions);
+
 	// "instructions" should be an array, we need to iterate over it to find the "TimelineAddEntries" type
 	let tweets = undefined;
 	let isAddToModule = false;
@@ -140,7 +136,11 @@ export function HandleInstructionsResponse(e, body) {
 
 			default:
 				if (!IgnoreTweetTypes.has(tweet.content.entryType)) {
-					console.error(logstr, `unexpected tweet type found: ${tweet.content.entryType}`, tweet);
+					throw {
+						message: `unexpected tweet type found: ${tweet?.content?.entryType}`,
+						name: "TweetType",
+						tweet,
+					};
 				}
 		}
 	}

diff --git a/popup/index.html b/popup/index.html
@@ -95,7 +95,7 @@ <h2><img src="../assets/icon.png" alt="🅱️">lue Blocker</h2>
 				<span id="block-interval-status"></span>
 			</div>
 			<div class="slider">
-				<input type="range" min="5" max="60" value="5" id="block-interval">
+				<input type="range" min="5" max="60" value="15" id="block-interval">
 				<span id="block-interval-value"></span>
 			</div>
 		</div>

diff --git a/script.js b/script.js
@@ -1,5 +1,5 @@
-import { api, logstr } from './constants.js';
-import { ClearCache } from './shared.js';
+import { api } from './constants.js';
+import { ClearCache, ErrorEvent, EventKey } from './shared.js';
 import { HandleInstructionsResponse } from './parsers/instructions.js';
 import { HandleForYou } from './parsers/timeline.js';
 import { HandleTypeahead } from './parsers/search.js';
@@ -23,19 +23,25 @@ document.addEventListener("blue-blocker-event", function (e) {
 	// TODO: we may want to seriously consider clearing the cache on a much less frequent
 	// cadence since we're no longer able to block users immediately and need the queue
 	ClearCache();
-	const body = JSON.parse(e.detail.body);
-	switch (e.detail.parsedUrl[1]) {
-		case "HomeLatestTimeline":
-		case "HomeTimeline":
-		case "UserTweets":
-		case "TweetDetail":
-			return HandleInstructionsResponse(e, body);
-		case "timeline/home.json":
-		case "search/adaptive.json":
-			return HandleForYou(e, body);
-		case "search/typeahead.json":
-			return HandleTypeahead(e, body);
-		default:
-			console.error(logstr, "found an unexpected url that we don't know how to handle:", e.detail.url);
+	let body = null;
+	try {
+		body = JSON.parse(e.detail.body);
+		switch (e.detail.parsedUrl[1]) {
+			case "HomeLatestTimeline":
+			case "HomeTimeline":
+			case "UserTweets":
+			case "TweetDetail":
+				return HandleInstructionsResponse(e, body);
+			case "timeline/home.json":
+			case "search/adaptive.json":
+				return HandleForYou(e, body);
+			case "search/typeahead.json":
+				return HandleTypeahead(e, body);
+			default:
+				api.storage.local.set({ [EventKey]: { type: ErrorEvent, message: "found an unexpected url that we don't know how to handle", detail: e } });
+		}
+	}
+	catch (error) {
+		api.storage.local.set({ [EventKey]: { type: ErrorEvent, message: "exepected error occurred while parsing request body", detail: { error, body, event: e } } });
 	}
 });
diff --git a/shared.js b/shared.js
@@ -76,14 +76,15 @@ function unblockUser(user, user_id, headers, reason) {
 	ajax.send(formdata);
 }
 
-const eventKey = "MultiTabEvent";
+export const EventKey = "MultiTabEvent";
+export const ErrorEvent = "ErrorEvent";
 const UserBlockedEvent = "UserBlockedEvent";
 api.storage.local.onChanged.addListener(items => {
 	// we're using local storage as a really dirty event driver
-	if (!items.hasOwnProperty(eventKey)) {
+	if (!items.hasOwnProperty(EventKey)) {
 		return;
 	}
-	const e = items[eventKey].newValue;
+	const e = items[EventKey].newValue;
 
 	switch (e.type) {
 		case UserBlockedEvent:
@@ -106,6 +107,20 @@ api.storage.local.onChanged.addListener(items => {
 			}
 			break;
 
+		case ErrorEvent:
+			// skip checking options, since errors should always be shown
+			const { message, detail } = e;
+			console.error(logstr, `${message}:`, detail);
+
+			const t = document.createElement("div");
+			t.className = "toast error";
+			t.innerHTML = `<p>an error occurred! check the console and create an issue on <a href="https://github.com/kheina-com/Blue-Blocker/issues" target="_blank">GitHub</a></p>`;
+
+			const ele = document.getElementById("injected-blue-block-toasts");
+			ele.appendChild(t);
+			setTimeout(() => ele.removeChild(t), 60e3);
+			break;
+
 		default:
 			console.error(logstr, "unknown multitab event occurred:", e);
 	}
@@ -129,18 +144,25 @@ function QueueBlockUser(user, user_id, headers, reason) {
 }
 
 function CheckBlockQueue() {
-	api.storage.sync.get(DefaultOptions).then(items => {
-		SetOptions(items);
-	})
-	.then(() => queue.shift())
-	.then(item => {
-		if (item === undefined) {
-			consumer.stop();
-			return;
-		}
-		const {user, user_id, headers, reason} = item;
-		BlockUser(user, user_id, headers, reason);
-	});
+	let event = null;
+	try {
+		api.storage.sync.get(DefaultOptions).then(items => {
+			SetOptions(items);
+		})
+		.then(() => queue.shift())
+		.then(item => {
+			event = item;
+			if (item === undefined) {
+				consumer.stop();
+				return;
+			}
+			const {user, user_id, headers, reason} = item;
+			BlockUser(user, user_id, headers, reason);
+		});
+	}
+	catch (error) {
+		api.storage.local.set({ [EventKey]: { type: ErrorEvent, message: "unexpected error occurred while processing block queue", detail: { error, event } } });
+	}
 }
 
 const consumer = new QueueConsumer(api.storage.local, CheckBlockQueue, async s => {
@@ -171,7 +193,7 @@ function BlockUser(user, user_id, headers, reason, attempt=1) {
 		else {
 			blockCounter.increment();
 			console.log(logstr, `blocked ${user.legacy.name} (@${user.legacy.screen_name}) due to ${ReasonMap[reason]}.`);
-			api.storage.local.set({ [eventKey]: { type: UserBlockedEvent, user, user_id, headers, reason } })
+			api.storage.local.set({ [EventKey]: { type: UserBlockedEvent, user, user_id, headers, reason } })
 		}
 	});
 	ajax.addEventListener('error', error => {