Skip to content

Commit d80eb65

Browse files
MaddyUnderStarsMaddyUnderStars
committed
prettier
1 parent 31bffa5 commit d80eb65

13 files changed

+181
-267
lines changed

‎.prettierrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"quoteProps": "as-needed",
99
"useTabs": true,
1010
"singleQuote": false
11-
}
11+
}

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Fediredirect
22

3-
open to name suggestions cause 'fediredirect' is used by literally everyone
3+
open to name suggestions cause 'fediredirect' is used by literally everyone
44

55
planned featureset:
66

7-
- automatic redirection
8-
- manual redirection for when ^ doesn't work or if you've disabled it for that instance
9-
- support for mastodon, lemmy at least. hopefully also *key and/or akkoma
10-
- erm, perhaps other things
7+
- automatic redirection
8+
- manual redirection for when ^ doesn't work or if you've disabled it for that instance
9+
- support for mastodon, lemmy at least. hopefully also \*key and/or akkoma
10+
- erm, perhaps other things

‎esbuild.js

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
const esbuild = require("esbuild");
22

3-
esbuild.build({
4-
entryPoints: [
5-
"./src/background.ts",
6-
"./src/settings/index.ts",
7-
"./src/popup/index.ts",
8-
],
9-
bundle: true,
10-
minify: true,
11-
sourcemap: process.env.NODE_ENV !== "production",
12-
target: ["firefox57"],
13-
outdir: "./build",
14-
define: {
15-
"process.env.NODE_ENV": `"${process.env.NODE_ENV}"`
16-
}
17-
})
18-
.catch((e) => process.exit(1));
3+
esbuild
4+
.build({
5+
entryPoints: [
6+
"./src/background.ts",
7+
"./src/settings/index.ts",
8+
"./src/popup/index.ts",
9+
],
10+
bundle: true,
11+
minify: true,
12+
sourcemap: process.env.NODE_ENV !== "production",
13+
target: ["firefox57"],
14+
outdir: "./build",
15+
define: {
16+
"process.env.NODE_ENV": `"${process.env.NODE_ENV}"`,
17+
},
18+
})
19+
.catch((e) => process.exit(1));

‎manifest.json

+3-10
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
"version": "1.0",
55
"description": "Redirects Fediverse posts to your home instance",
66
"homepage_url": "https://github.com/MaddyUnderStars/fediredirect",
7-
"permissions": [
8-
"activeTab",
9-
"storage",
10-
"webNavigation",
11-
"https://*/*"
12-
],
7+
"permissions": ["activeTab", "storage", "webNavigation", "https://*/*"],
138
"browser_action": {
149
"browser_style": false,
1510
"default_icon": "./icons/fedi.png",
@@ -21,8 +16,6 @@
2116
"open_in_tab": true
2217
},
2318
"background": {
24-
"scripts": [
25-
"./build/background.js"
26-
]
19+
"scripts": ["./build/background.js"]
2720
}
28-
}
21+
}

‎public/popup.html

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
4-
<head>
5-
<meta charset="UTF-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Fediredirect</title>
8-
</head>
9-
10-
<body>
11-
<button id="mastodon">redirect to mastodon</button>
12-
13-
<script src="../build/popup/index.js"></script>
14-
</body>
15-
16-
</html>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<title>Fediredirect</title>
7+
</head>
8+
9+
<body>
10+
<button id="mastodon">redirect to mastodon</button>
11+
12+
<script src="../build/popup/index.js"></script>
13+
</body>
14+
</html>

‎public/settings.html

+32-29
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<title>Fediredirect | Settings</title>
37

4-
<head>
5-
<meta charset="UTF-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Fediredirect | Settings</title>
8+
<style>
9+
html,
10+
body {
11+
background-color: black;
12+
color: white;
13+
padding: 20px;
14+
}
15+
</style>
16+
</head>
817

9-
<style>
10-
html,
11-
body {
12-
background-color: black;
13-
color: white;
14-
padding: 20px;
15-
}
16-
</style>
17-
</head>
18+
<body>
19+
<div class="container">
20+
<form id="mastodon">
21+
<p>Mastodon:</p>
22+
<label for="mastodon_instance">Instance: </label>
23+
<input
24+
type="url"
25+
id="mastodon_instance"
26+
name="instance"
27+
required
28+
/>
29+
<label for="mastodon_code">Code: </label>
30+
<input type="code" id="mastodon_code" name="code" />
31+
<input type="submit" />
32+
</form>
33+
</div>
1834

19-
<body>
20-
<div class="container">
21-
<form id="mastodon">
22-
<p>Mastodon:</p>
23-
<label for="mastodon_instance">Instance: </label>
24-
<input type="url" id="mastodon_instance" name="instance" required>
25-
<label for="mastodon_code">Code: </label>
26-
<input type="code" id="mastodon_code" name="code">
27-
<input type="submit">
28-
</form>
29-
</div>
30-
31-
<script src="../build/settings/index.js"></script>
32-
</body>
33-
34-
</html>
35+
<script src="../build/settings/index.js"></script>
36+
</body>
37+
</html>

‎src/lib/index.ts

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { MastodonApplication } from "../types/mastodon";
22

3-
type Application = MastodonApplication; // TODO;
3+
type Application = MastodonApplication; // TODO;
44

55
export type Handler = {
66
type: string;
@@ -16,14 +16,12 @@ export type Handler = {
1616

1717
/** Check whether a URL looks like it belongs to this service */
1818
urlLooksValid: (url: URL) => boolean;
19-
}
19+
};
2020

2121
export const getHandlersForUrl = (url: URL) => {
22-
return handlers.filter(x => x.urlLooksValid(url));
23-
}
22+
return handlers.filter((x) => x.urlLooksValid(url));
23+
};
2424

2525
import mastodon from "./mastodon";
26-
const handlers = [
27-
mastodon
28-
] as Handler[];
29-
export default handlers;
26+
const handlers = [mastodon] as Handler[];
27+
export default handlers;

‎src/lib/mastodon.ts

+27-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { MastodonApplication, MastodonSearchResults, RedirectSettings } from "../types/mastodon";
1+
import {
2+
MastodonApplication,
3+
MastodonSearchResults,
4+
RedirectSettings,
5+
} from "../types/mastodon";
26
import { Handler } from "./index";
37

48
const MASTODON_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob";
@@ -17,7 +21,7 @@ const createApp = async (instance: URL) => {
1721
const json = await res.json();
1822

1923
return json as MastodonApplication;
20-
}
24+
};
2125

2226
const makeAuthUrl = (instance: URL, app: MastodonApplication) => {
2327
const ret = new URL(instance);
@@ -27,50 +31,55 @@ const makeAuthUrl = (instance: URL, app: MastodonApplication) => {
2731
ret.searchParams.append("redirect_uri", MASTODON_REDIRECT_URI);
2832
ret.searchParams.append("response_type", "code");
2933
return ret;
30-
}
34+
};
3135

3236
const findRemote = async (url: URL) => {
33-
const opts = (await browser.storage.local.get()).mastodon as RedirectSettings;
37+
const opts = (await browser.storage.local.get())
38+
.mastodon as RedirectSettings;
3439
const requrl = new URL(opts.instance);
3540
requrl.pathname = "/api/v2/search";
3641
requrl.searchParams.append("q", url.toString());
3742
requrl.searchParams.append("resolve", "true");
3843
requrl.searchParams.append("limit", "1");
39-
44+
4045
const res = await fetch(requrl, {
4146
credentials: "include",
4247
mode: "no-cors",
4348
headers: {
4449
Authorization: `Bearer ${opts.code}`,
4550
},
4651
});
47-
const json = await res.json() as MastodonSearchResults;
52+
const json = (await res.json()) as MastodonSearchResults;
4853
console.log(json);
4954

5055
const status = json.statuses[0];
51-
return new URL(`${new URL(opts.instance).origin}/@${status.account.username}@${url.hostname}/${status.id}`);
52-
}
56+
return new URL(
57+
`${new URL(opts.instance).origin}/@${status.account.username}@${
58+
url.hostname
59+
}/${status.id}`,
60+
);
61+
};
5362

5463
//thanks tusky
5564
const mastodonUrlRegexes = [
56-
/^\/@[^\/]+$/i, // /@User
57-
/^\/@[^\/]+\/\d+$/i, // /@User/43456787654678
58-
/^\/users\/[^\/]+\/statuses\/\d+$/i, // /users/User/statuses/43456787654678
59-
/^\/users\/\w+$/i, // /users/User
60-
/^\/user\/[^\/]+\/comment\/\d+$/i, // /user/User/comment/123456
65+
/^\/@[^\/]+$/i, // /@User
66+
/^\/@[^\/]+\/\d+$/i, // /@User/43456787654678
67+
/^\/users\/[^\/]+\/statuses\/\d+$/i, // /users/User/statuses/43456787654678
68+
/^\/users\/\w+$/i, // /users/User
69+
/^\/user\/[^\/]+\/comment\/\d+$/i, // /user/User/comment/123456
6170
/^\/user\/\w+$/i, // /user/User
6271
/^\/notice\/[a-zA-Z0-9]+$/i, // /notice/9sBHWIlwwGZi5QGlHc
63-
/^\/objects\/[-a-f0-9]+$/i, // /objects/d4643c42-3ae0-4b73-b8b0-c725f5819207
72+
/^\/objects\/[-a-f0-9]+$/i, // /objects/d4643c42-3ae0-4b73-b8b0-c725f5819207
6473
/^\/notes\/[a-z0-9]+$/i,
6574
/^\/display\/[-a-f0-9]+$/i, // /display/d4643c42-3ae0-4b73-b8b0-c725f5819207
6675
/^\/profile\/\w+$/i,
6776
/^\/p\/\w+\/\\d+$/i,
6877
/^\/@[^\/]+\/statuses\/[a-zA-Z0-9]+$/i,
6978
/^\/o\/[a-f0-9]+$/i,
70-
]
79+
];
7180
const urlLooksValid = (url: URL) => {
72-
return !!mastodonUrlRegexes.find(x => x.test(url.pathname));
73-
}
81+
return !!mastodonUrlRegexes.find((x) => x.test(url.pathname));
82+
};
7483

7584
const handlers = {
7685
type: "mastodon",
@@ -79,4 +88,4 @@ const handlers = {
7988
findRemote,
8089
urlLooksValid,
8190
} as Handler;
82-
export default handlers;
91+
export default handlers;

‎src/popup/index.ts

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
import { getHandlersForUrl } from "../lib/index";
22
import { validateUrl } from "../utils";
33

4-
document.getElementById("mastodon")?.addEventListener("click", async (event) => {
5-
event.preventDefault();
4+
document
5+
.getElementById("mastodon")
6+
?.addEventListener("click", async (event) => {
7+
event.preventDefault();
68

7-
const tab = (await browser.tabs.query({ active: true, currentWindow: true, }))[0];
8-
const url = validateUrl(tab.url);
9-
if (!url) return;
9+
const tab = (
10+
await browser.tabs.query({ active: true, currentWindow: true })
11+
)[0];
12+
const url = validateUrl(tab.url);
13+
if (!url) return;
1014

11-
// TODO: find which software the current tab runs
12-
// TODO: instead of filtering by what the URL looks like, use the above to just grab the handler ourselves
15+
// TODO: find which software the current tab runs
16+
// TODO: instead of filtering by what the URL looks like, use the above to just grab the handler ourselves
1317

14-
const handlers = getHandlersForUrl(url);
15-
if (!handlers.length) return;
18+
const handlers = getHandlersForUrl(url);
19+
if (!handlers.length) return;
1620

17-
const handler = handlers[0];
21+
const handler = handlers[0];
1822

19-
const post = await handler.findRemote(url);
23+
const post = await handler.findRemote(url);
2024

21-
browser.tabs.update(undefined, {
22-
url: post.toString(),
23-
})
24-
})
25+
browser.tabs.update(undefined, {
26+
url: post.toString(),
27+
});
28+
});

0 commit comments

Comments
 (0)