jeena/lemmy-simplified-federation
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'hueyy-fix/v4_bugs'

Browse source
This commit is contained in:
rugk 2022-12-13 11:37:28 +01:00
commit 5e014f3a52
No known key found for this signature in database
GPG key ID: BE52D11B43801061
5 changed files with 69 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/_locales/de/messages.json
View file

@ -156,11 +156,11 @@
},
"optionRedirectInMainWindow": {
"message": "Verhindere die Nutzung eines Popups.",
"message": "In aktuellem Tab umleiten.",
"description": "This is an option shown in the add-on settings."
},
"optionRedirectInMainWindowDescr": {
"message": "Verhindert die Benutzung eines extra Fensters und leitet stattdessen die Hauptseite um.",
"message": "Verhindert die Benutzung eines extra Tabs und leitet stattdessen die Hauptseite um.",
"description": "This is an option shown in the add-on settings."
},

4
src/_locales/en/messages.json
View file

@ -156,11 +156,11 @@
},
"optionRedirectInMainWindow": {
"message": "Prevent popup usage.",
"message": "Redirect in main window.",
"description": "This is an option shown in the add-on settings."
},
"optionRedirectInMainWindowDescr": {
"message": "Prevents the use of an extra window and instead redirects the action on the main page.",
"message": "Prevents the use of an extra tab and instead redirects the action on the main page.",
"description": "This is an option shown in the add-on settings."
},
"translatorCredit": {

4
src/background/modules/AutoRemoteFollow.js
View file

@ -155,8 +155,8 @@ async function onTabUpdate(tabId, changeInfo) {
const ownMastodon = await AddonSettings.get("ownMastodon");
const currentURL = new URL(changeInfo.url);
if (ownMastodon.server !== currentURL.hostname){
browser.tabs.executeScript({
file: "/content_script/mastodonInject.js"
browser.tabs.executeScript(tabId, {
file: "/content_script/mastodonInject.js",
});
}
}

95
src/content_script/mastodonInject.js
View file

@ -1,7 +1,5 @@
"use strict";
const TIMEOUT_DURATION = 20000;
/**
* Replacement onClick handler for Follow button.
*
@ -26,10 +24,14 @@ function onClickInteract(event) {
event.stopPropagation();
event.preventDefault();
const articleElement = event.target.closest("article[data-id]");
const getId = () => {
const rawId = articleElement.getAttribute("data-id");
return rawId.slice(0, 2) === "f-" ? rawId.slice(2) : rawId;
};
const tootId = (
articleElement === null
? window.location.pathname.split("/").slice(-1)[0]
: articleElement.getAttribute("data-id")
: getId()
);
// activate AutoRemoteFollow
window.open(`/interact/${tootId}`, "_blank");
@ -40,12 +42,12 @@ function onClickInteract(event) {
*
* @param {string} selector
* @param {boolean} [multiple=false]
* @param {number} timeoutDuration
* @param {number} [timeoutDuration=200000]
* @see {@link https://github.com/storybookjs/test-runner/blob/6d41927154e8dd1e4c9e7493122e24e2739a7a0f/src/setup-page.ts#L134}
* from which this was adapted
* @returns {Promise}
*/
function waitForElement(selector, multiple = false, timeoutDuration) {
function waitForElement(selector, multiple = false, timeoutDuration = 200000) {
return new Promise((resolve, reject) => {
const getElement = () => (
multiple
@ -59,14 +61,14 @@ function waitForElement(selector, multiple = false, timeoutDuration) {
}, timeoutDuration);
const element = getElement();
if (isElementFound(element)){
if (isElementFound(element)) {
window.clearTimeout(timeout);
return resolve(element);
}
const observer = new MutationObserver(() => {
const element = getElement();
if (isElementFound(element)){
if (isElementFound(element)) {
window.clearTimeout(timeout);
resolve(element);
observer.disconnect();
@ -79,7 +81,7 @@ function waitForElement(selector, multiple = false, timeoutDuration) {
});
return null;
});
});
}
/**
@ -89,7 +91,7 @@ function waitForElement(selector, multiple = false, timeoutDuration) {
*/
async function injectFollowButton() {
try {
const followButton = await waitForElement("#mastodon .account__header__tabs__buttons button:first-of-type", false, TIMEOUT_DURATION);
const followButton = await waitForElement("#mastodon .account__header__tabs__buttons button:first-of-type", false);
followButton.addEventListener("click", onClickFollow);
} catch (error) {
// Follow button failed to appear
@ -103,22 +105,30 @@ async function injectFollowButton() {
*/
async function injectInteractionButtons() {
const INJECTED_REPLY_CLASS = "mastodon-simplified-federation-injected-interaction";
const replyButtons = await waitForElement(
"#mastodon .item-list[role='feed'] article[data-id] .status__action-bar button," +
"#mastodon .detailed-status__wrapper .detailed-status__action-bar button",
true,
TIMEOUT_DURATION,
);
replyButtons.forEach((button) => {
try {
if (!button.classList.contains(INJECTED_REPLY_CLASS)){
button.addEventListener("click", onClickInteract);
button.classList.add(INJECTED_REPLY_CLASS);
const TIMELINE_SELECTOR = "#mastodon .item-list[role='feed'] article[data-id] .status__action-bar button"; // timeline / user profile
const STATUS_NO_REPLIES_SELECTOR = "#mastodon .detailed-status__wrapper .detailed-status__action-bar button"; // status with no replies
const STATUS_WITH_REPLIES_SELECTOR = "#mastodon .status__wrapper .status__action-bar button"; // status with replies
try {
const replyButtons = await waitForElement([
TIMELINE_SELECTOR,
STATUS_NO_REPLIES_SELECTOR,
STATUS_WITH_REPLIES_SELECTOR,
].join(","), true,);
replyButtons.forEach((button) => {
try {
if (!button.classList.contains(INJECTED_REPLY_CLASS)) {
button.addEventListener("click", onClickInteract);
button.classList.add(INJECTED_REPLY_CLASS);
}
} catch (error) {
// Failed to inject interaction buttons
}
} catch (error) {
// Interaction buttons failed to appear
}
});
});
} catch (error) {
// Interaction buttons failed to appear
}
}
/**
@ -126,23 +136,40 @@ async function injectInteractionButtons() {
*
* @returns {void}
*/
function initInjections() {
injectFollowButton().catch(console.error);
injectInteractionButtons().catch(console.error);
}
/**
* Initialise script and re-run if there are changes.
*
* @returns {void}
*/
async function init() {
injectFollowButton();
const MASTODON_INJECTED_CLASS = "mastodon-simplified-federation-injected";
if (document.body.classList.contains(MASTODON_INJECTED_CLASS)) {
// init has already run
return;
}
document.body.classList.add(MASTODON_INJECTED_CLASS);
initInjections();
const observer = new MutationObserver(() => {
Promise.allSettled([
injectInteractionButtons(),
]);
initInjections();
});
const feedElement = await waitForElement(
"#mastodon .item-list[role='feed']",
// monitor only the main column in the Mastodon UI
const mainColumn = await waitForElement(
"#mastodon .ui",
false,
TIMEOUT_DURATION
);
observer.observe(feedElement, {
childList: true, subtree: true,
observer.observe(mainColumn, {
childList: true,
subtree: true,
});
}
init();
init().catch(console.error);

4
src/options/options.html
View file

@ -71,10 +71,10 @@
<li>
<div class="line">
<input class="setting save-on-change" type="checkbox" id="redirectInMainWindow" name="redirectInMainWindow">
<label data-i18n="__MSG_optionRedirectInMainWindow__" for="redirectInMainWindow">Prevent popup usage</label>
<label data-i18n="__MSG_optionRedirectInMainWindow__" for="redirectInMainWindow">Redirect in current tab.</label>
</div>
<div class="line indent">
<span data-i18n="__MSG_optionRedirectInMainWindowDescr__" class="helper-text">Prevents the use of an extra window and instead redirects the action on the main page.</span>
<span data-i18n="__MSG_optionRedirectInMainWindowDescr__" class="helper-text">Prevents the use of an extra tab and instead redirects the action on the main page.</span>
</div>
<div class="message-container line indent">
<div id="redirectInMainWindowPermissionInfo" aria-label="info message" data-i18n data-i18n-aria-label="__MSG_ariaMessageInfo__" class="message-box info invisible fade-hide">