mirror of
https://github.com/snachodog/tok-to-insta-follower-bridge.git
synced 2025-04-04 03:01:25 -06:00
💫 add biome and format src files.
This commit is contained in:
kawamataryo
parent
6deacda7bd
commit
b9c51dd758
18
.github/workflows/code_quolity.yml
vendored
Normal file
18
.github/workflows/code_quolity.yml
vendored
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
name: Code quality
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
quality:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Setup Biome
|
||||||
|
uses: biomejs/setup-biome@v2
|
||||||
|
with:
|
||||||
|
version: latest
|
||||||
|
- name: Run Biome
|
||||||
|
run: biome ci ./src
|
||||||
18
biome.json
Normal file
18
biome.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://biomejs.dev/schemas/1.5.1/schema.json",
|
||||||
|
"organizeImports": {
|
||||||
|
"enabled": true
|
||||||
|
},
|
||||||
|
"formatter": {
|
||||||
|
"indentStyle": "space"
|
||||||
|
},
|
||||||
|
"linter": {
|
||||||
|
"enabled": true,
|
||||||
|
"rules": {
|
||||||
|
"recommended": true,
|
||||||
|
"a11y": {
|
||||||
|
"noSvgWithoutTitle": "off"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
232
package-lock.json
generated
232
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "sky-follower-bridge",
|
"name": "sky-follower-bridge",
|
||||||
"version": "0.7.4",
|
"version": "0.7.5",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "sky-follower-bridge",
|
"name": "sky-follower-bridge",
|
||||||
"version": "0.7.4",
|
"version": "0.7.5",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@atproto/api": "^0.7.4",
|
"@atproto/api": "^0.7.4",
|
||||||
"@changesets/cli": "^2.27.1",
|
"@changesets/cli": "^2.27.1",
|
||||||
@ -19,6 +19,7 @@
|
|||||||
"vanjs-core": "^1.2.7"
|
"vanjs-core": "^1.2.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@biomejs/biome": "1.5.1",
|
||||||
"@plasmohq/prettier-plugin-sort-imports": "4.0.1",
|
"@plasmohq/prettier-plugin-sort-imports": "4.0.1",
|
||||||
"@types/chrome": "0.0.254",
|
"@types/chrome": "0.0.254",
|
||||||
"@types/node": "20.10.6",
|
"@types/node": "20.10.6",
|
||||||
@ -452,6 +453,161 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@biomejs/biome": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-rdMA/N1Zc1nxUtbXMVr+50Sg/Pezz+9qGQa2uyRWFtrCoyr3dv0pVz+0ifGGue18ip50ZH8x2r5CV7zo8Q/0mA==",
|
||||||
|
"dev": true,
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"bin": {
|
||||||
|
"biome": "bin/biome"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/biome"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@biomejs/cli-darwin-arm64": "1.5.1",
|
||||||
|
"@biomejs/cli-darwin-x64": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-arm64": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-arm64-musl": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-x64": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-x64-musl": "1.5.1",
|
||||||
|
"@biomejs/cli-win32-arm64": "1.5.1",
|
||||||
|
"@biomejs/cli-win32-x64": "1.5.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-darwin-arm64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-E9pLakmSVHP6UH2uqAghqEkr/IHAIDfDyCedqJVnyFc+uufNTHwB8id4XTiWy/eKIdgxHZsTSE+R+W0IqrTNVQ==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-darwin-x64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-8O1F+FcoCi02JlocyilB6R3y3kT9sRkBCRwYddaBIScQe2hCme/mA2rVzrhCCHhskrclJ51GEKjkEORj4/8c2A==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-linux-arm64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-25gwY4FMzmi1Rl6N835raLq7nzTk+PyEQd88k9Em6dqtI4qpljqmZlMmVjOiwXKe3Ee80J/Vlh7BM36lsHUTEg==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-linux-arm64-musl": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-Lw9G3LUdhRMp8L8RMeVevnfQCa7luT6ubQ8GRjLju32glxWKefpDrzgfHixGyvTQPlhnYjQ+V8/QQ/I7WPzOoA==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-linux-x64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-YDM0gZP4UbAuaBI3DVbUuj5X+Omm6uxzD1Qpc6hcduH1kzXzs9L0ee7cn/kJtNndoXR8MlmUS0O0/wWvZf2YaA==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-linux-x64-musl": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-5gapxc/VlwTgGRbTc9h8PMTpf8eNahIBauFUGSXncHgayi3VpezKSicgaQ1bb8FahVXf/5eNEVxVARq/or71Ag==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-win32-arm64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-TVpLBOLUMLQmH2VRFBKFr3rgEkr7XvG4QZxHOxWB9Ivc/sQPvg4aHMd8qpgPKXABGUnultyc9t0+WvfIDxuALg==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"win32"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@biomejs/cli-win32-x64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-qx8EKwScZmVYZjMPZ6GF3ZUmgg/N6zqh+d8vHA2E43opNCyqIPTl89sOqkc7zd1CyyABDWxsbqI9Ih6xTT6hnQ==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"win32"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@changesets/apply-release-plan": {
|
"node_modules/@changesets/apply-release-plan": {
|
||||||
"version": "7.0.0",
|
"version": "7.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.0.tgz",
|
||||||
@ -12917,6 +13073,78 @@
|
|||||||
"to-fast-properties": "^2.0.0"
|
"to-fast-properties": "^2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@biomejs/biome": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-rdMA/N1Zc1nxUtbXMVr+50Sg/Pezz+9qGQa2uyRWFtrCoyr3dv0pVz+0ifGGue18ip50ZH8x2r5CV7zo8Q/0mA==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"@biomejs/cli-darwin-arm64": "1.5.1",
|
||||||
|
"@biomejs/cli-darwin-x64": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-arm64": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-arm64-musl": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-x64": "1.5.1",
|
||||||
|
"@biomejs/cli-linux-x64-musl": "1.5.1",
|
||||||
|
"@biomejs/cli-win32-arm64": "1.5.1",
|
||||||
|
"@biomejs/cli-win32-x64": "1.5.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"@biomejs/cli-darwin-arm64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-E9pLakmSVHP6UH2uqAghqEkr/IHAIDfDyCedqJVnyFc+uufNTHwB8id4XTiWy/eKIdgxHZsTSE+R+W0IqrTNVQ==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-darwin-x64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-8O1F+FcoCi02JlocyilB6R3y3kT9sRkBCRwYddaBIScQe2hCme/mA2rVzrhCCHhskrclJ51GEKjkEORj4/8c2A==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-linux-arm64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-25gwY4FMzmi1Rl6N835raLq7nzTk+PyEQd88k9Em6dqtI4qpljqmZlMmVjOiwXKe3Ee80J/Vlh7BM36lsHUTEg==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-linux-arm64-musl": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-Lw9G3LUdhRMp8L8RMeVevnfQCa7luT6ubQ8GRjLju32glxWKefpDrzgfHixGyvTQPlhnYjQ+V8/QQ/I7WPzOoA==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-linux-x64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-YDM0gZP4UbAuaBI3DVbUuj5X+Omm6uxzD1Qpc6hcduH1kzXzs9L0ee7cn/kJtNndoXR8MlmUS0O0/wWvZf2YaA==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-linux-x64-musl": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-5gapxc/VlwTgGRbTc9h8PMTpf8eNahIBauFUGSXncHgayi3VpezKSicgaQ1bb8FahVXf/5eNEVxVARq/or71Ag==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-win32-arm64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-TVpLBOLUMLQmH2VRFBKFr3rgEkr7XvG4QZxHOxWB9Ivc/sQPvg4aHMd8qpgPKXABGUnultyc9t0+WvfIDxuALg==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@biomejs/cli-win32-x64": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.5.1.tgz",
|
||||||
|
"integrity": "sha512-qx8EKwScZmVYZjMPZ6GF3ZUmgg/N6zqh+d8vHA2E43opNCyqIPTl89sOqkc7zd1CyyABDWxsbqI9Ih6xTT6hnQ==",
|
||||||
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"@changesets/apply-release-plan": {
|
"@changesets/apply-release-plan": {
|
||||||
"version": "7.0.0",
|
"version": "7.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.0.tgz",
|
||||||
|
|||||||
@ -10,7 +10,8 @@
|
|||||||
"build:firefox": "plasmo build --target=firefox-mv3",
|
"build:firefox": "plasmo build --target=firefox-mv3",
|
||||||
"package": "plasmo package",
|
"package": "plasmo package",
|
||||||
"package:firefox": "plasmo package --target=firefox-mv3",
|
"package:firefox": "plasmo package --target=firefox-mv3",
|
||||||
"run-client": "ts-node --project tsconfig.script.json scripts/client.ts"
|
"run-client": "ts-node --project tsconfig.script.json scripts/client.ts",
|
||||||
|
"check": "npx @biomejs/biome check --apply-unsafe ./src"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@atproto/api": "^0.7.4",
|
"@atproto/api": "^0.7.4",
|
||||||
@ -24,6 +25,7 @@
|
|||||||
"vanjs-core": "^1.2.7"
|
"vanjs-core": "^1.2.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@biomejs/biome": "1.5.1",
|
||||||
"@plasmohq/prettier-plugin-sort-imports": "4.0.1",
|
"@plasmohq/prettier-plugin-sort-imports": "4.0.1",
|
||||||
"@types/chrome": "0.0.254",
|
"@types/chrome": "0.0.254",
|
||||||
"@types/node": "20.10.6",
|
"@types/node": "20.10.6",
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
import type { PlasmoMessaging } from "@plasmohq/messaging"
|
import type { PlasmoMessaging } from "@plasmohq/messaging";
|
||||||
import { BskyClient } from "~lib/bskyClient";
|
import { BskyClient } from "~lib/bskyClient";
|
||||||
|
|
||||||
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
||||||
const { session, subjectDid } = req.body
|
const { session, subjectDid } = req.body;
|
||||||
const client = BskyClient.createAgentFromSession(session)
|
const client = BskyClient.createAgentFromSession(session);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
res.send({
|
res.send({
|
||||||
result: await client.block(subjectDid)
|
result: await client.block(subjectDid),
|
||||||
})
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
res.send({
|
res.send({
|
||||||
error: {
|
error: {
|
||||||
message: e.message,
|
message: e.message,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export default handler
|
export default handler;
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
import type { PlasmoMessaging } from "@plasmohq/messaging"
|
import type { PlasmoMessaging } from "@plasmohq/messaging";
|
||||||
import { BskyClient } from "~lib/bskyClient";
|
import { BskyClient } from "~lib/bskyClient";
|
||||||
|
|
||||||
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
||||||
const { session, subjectDid } = req.body
|
const { session, subjectDid } = req.body;
|
||||||
const client = BskyClient.createAgentFromSession(session)
|
const client = BskyClient.createAgentFromSession(session);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
res.send({
|
res.send({
|
||||||
result: await client.follow(subjectDid)
|
result: await client.follow(subjectDid),
|
||||||
})
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
res.send({
|
res.send({
|
||||||
error: {
|
error: {
|
||||||
message: e.message,
|
message: e.message,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export default handler
|
export default handler;
|
||||||
|
|||||||
@ -1,25 +1,25 @@
|
|||||||
import type { PlasmoMessaging } from "@plasmohq/messaging"
|
import type { PlasmoMessaging } from "@plasmohq/messaging";
|
||||||
import { BskyClient } from "../../lib/bskyClient";
|
import { BskyClient } from "../../lib/bskyClient";
|
||||||
|
|
||||||
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
||||||
const { identifier, password } = req.body
|
const { identifier, password } = req.body;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const agent = await BskyClient.createAgent({
|
const agent = await BskyClient.createAgent({
|
||||||
identifier,
|
identifier,
|
||||||
password,
|
password,
|
||||||
})
|
});
|
||||||
|
|
||||||
res.send({
|
res.send({
|
||||||
session: agent.session,
|
session: agent.session,
|
||||||
})
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
res.send({
|
res.send({
|
||||||
error: {
|
error: {
|
||||||
message: e.message,
|
message: e.message,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export default handler
|
export default handler;
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
import type { PlasmoMessaging } from "@plasmohq/messaging"
|
import type { PlasmoMessaging } from "@plasmohq/messaging";
|
||||||
import { BskyClient } from "~lib/bskyClient";
|
import { BskyClient } from "~lib/bskyClient";
|
||||||
|
|
||||||
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
||||||
const { session, term, limit } = req.body
|
const { session, term, limit } = req.body;
|
||||||
const client = BskyClient.createAgentFromSession(session)
|
const client = BskyClient.createAgentFromSession(session);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
res.send({
|
res.send({
|
||||||
actors: await client.searchUser({
|
actors: await client.searchUser({
|
||||||
term,
|
term,
|
||||||
limit,
|
limit,
|
||||||
})
|
}),
|
||||||
})
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
res.send({
|
res.send({
|
||||||
error: {
|
error: {
|
||||||
message: e.message,
|
message: e.message,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export default handler
|
export default handler;
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
import type { PlasmoMessaging } from "@plasmohq/messaging"
|
import type { PlasmoMessaging } from "@plasmohq/messaging";
|
||||||
import { BskyClient } from "~lib/bskyClient";
|
import { BskyClient } from "~lib/bskyClient";
|
||||||
|
|
||||||
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
||||||
const { session, blockUri } = req.body
|
const { session, blockUri } = req.body;
|
||||||
const client = BskyClient.createAgentFromSession(session)
|
const client = BskyClient.createAgentFromSession(session);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
res.send({
|
res.send({
|
||||||
result: await client.unblock(blockUri)
|
result: await client.unblock(blockUri),
|
||||||
})
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
res.send({
|
res.send({
|
||||||
error: {
|
error: {
|
||||||
message: e.message,
|
message: e.message,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export default handler
|
export default handler;
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
import type { PlasmoMessaging } from "@plasmohq/messaging"
|
import type { PlasmoMessaging } from "@plasmohq/messaging";
|
||||||
import { BskyClient } from "~lib/bskyClient";
|
import { BskyClient } from "~lib/bskyClient";
|
||||||
|
|
||||||
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
|
||||||
const { session, followUri } = req.body
|
const { session, followUri } = req.body;
|
||||||
const client = BskyClient.createAgentFromSession(session)
|
const client = BskyClient.createAgentFromSession(session);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
res.send({
|
res.send({
|
||||||
result: await client.unfollow(followUri)
|
result: await client.unfollow(followUri),
|
||||||
})
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
res.send({
|
res.send({
|
||||||
error: {
|
error: {
|
||||||
message: e.message,
|
message: e.message,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export default handler
|
export default handler;
|
||||||
|
|||||||
@ -1,21 +1,20 @@
|
|||||||
import { type BskyLoginParams } from "./lib/bskyClient";
|
import type { PlasmoCSConfig } from "plasmo";
|
||||||
import type { PlasmoCSConfig } from "plasmo"
|
|
||||||
import { MESSAGE_NAMES, VIEWER_STATE } from "~lib/constants";
|
|
||||||
import "./style.content.css"
|
|
||||||
import { searchAndInsertBskyUsers } from '~lib/searchAndInsertBskyUsers';
|
|
||||||
import { BskyServiceWorkerClient } from "~lib/bskyServiceWorkerClient";
|
import { BskyServiceWorkerClient } from "~lib/bskyServiceWorkerClient";
|
||||||
|
import { MESSAGE_NAMES, VIEWER_STATE } from "~lib/constants";
|
||||||
|
import { searchAndInsertBskyUsers } from "~lib/searchAndInsertBskyUsers";
|
||||||
|
import { type BskyLoginParams } from "./lib/bskyClient";
|
||||||
|
import "./style.content.css";
|
||||||
|
|
||||||
export const config: PlasmoCSConfig = {
|
export const config: PlasmoCSConfig = {
|
||||||
matches: ["https://twitter.com/*", "https://x.com/*"],
|
matches: ["https://twitter.com/*", "https://x.com/*"],
|
||||||
all_frames: true
|
all_frames: true,
|
||||||
}
|
};
|
||||||
|
|
||||||
const searchAndShowBskyUsers = async ({
|
const searchAndShowBskyUsers = async ({
|
||||||
identifier,
|
identifier,
|
||||||
password,
|
password,
|
||||||
messageName,
|
messageName,
|
||||||
}: BskyLoginParams & { messageName: string }) => {
|
}: BskyLoginParams & { messageName: string }) => {
|
||||||
|
|
||||||
const agent = await BskyServiceWorkerClient.createAgent({
|
const agent = await BskyServiceWorkerClient.createAgent({
|
||||||
identifier,
|
identifier,
|
||||||
password,
|
password,
|
||||||
@ -31,11 +30,12 @@ const searchAndShowBskyUsers = async ({
|
|||||||
progressive: "Following",
|
progressive: "Following",
|
||||||
},
|
},
|
||||||
statusKey: VIEWER_STATE.FOLLOWING,
|
statusKey: VIEWER_STATE.FOLLOWING,
|
||||||
userCellQueryParam: '[data-testid="primaryColumn"] [data-testid="UserCell"]',
|
userCellQueryParam:
|
||||||
|
'[data-testid="primaryColumn"] [data-testid="UserCell"]',
|
||||||
addQuery: async (arg: string) => await agent.follow(arg),
|
addQuery: async (arg: string) => await agent.follow(arg),
|
||||||
removeQuery: async (arg: string) => await agent.unfollow(arg),
|
removeQuery: async (arg: string) => await agent.unfollow(arg),
|
||||||
})
|
});
|
||||||
break
|
break;
|
||||||
case MESSAGE_NAMES.SEARCH_BSKY_USER_ON_LIST_MEMBERS_PAGE:
|
case MESSAGE_NAMES.SEARCH_BSKY_USER_ON_LIST_MEMBERS_PAGE:
|
||||||
await searchAndInsertBskyUsers({
|
await searchAndInsertBskyUsers({
|
||||||
agent,
|
agent,
|
||||||
@ -45,11 +45,12 @@ const searchAndShowBskyUsers = async ({
|
|||||||
progressive: "Following",
|
progressive: "Following",
|
||||||
},
|
},
|
||||||
statusKey: VIEWER_STATE.FOLLOWING,
|
statusKey: VIEWER_STATE.FOLLOWING,
|
||||||
userCellQueryParam: '[data-testid="cellInnerDiv"] [data-testid="UserCell"]',
|
userCellQueryParam:
|
||||||
|
'[data-testid="cellInnerDiv"] [data-testid="UserCell"]',
|
||||||
addQuery: async (arg: string) => await agent.follow(arg),
|
addQuery: async (arg: string) => await agent.follow(arg),
|
||||||
removeQuery: async (arg: string) => await agent.unfollow(arg),
|
removeQuery: async (arg: string) => await agent.unfollow(arg),
|
||||||
})
|
});
|
||||||
break
|
break;
|
||||||
case MESSAGE_NAMES.SEARCH_BSKY_USER_ON_BLOCK_PAGE:
|
case MESSAGE_NAMES.SEARCH_BSKY_USER_ON_BLOCK_PAGE:
|
||||||
// TODO: If already blocked, don't show blocking state. because blocking user can't find.
|
// TODO: If already blocked, don't show blocking state. because blocking user can't find.
|
||||||
await searchAndInsertBskyUsers({
|
await searchAndInsertBskyUsers({
|
||||||
@ -63,10 +64,10 @@ const searchAndShowBskyUsers = async ({
|
|||||||
userCellQueryParam: '[data-testid="UserCell"]',
|
userCellQueryParam: '[data-testid="UserCell"]',
|
||||||
addQuery: async (arg: string) => await agent.block(arg),
|
addQuery: async (arg: string) => await agent.block(arg),
|
||||||
removeQuery: async (arg: string) => await agent.unblock(arg),
|
removeQuery: async (arg: string) => await agent.unblock(arg),
|
||||||
})
|
});
|
||||||
break
|
break;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
chrome.runtime.onMessage.addListener((message, _, sendResponse) => {
|
chrome.runtime.onMessage.addListener((message, _, sendResponse) => {
|
||||||
if (Object.values(MESSAGE_NAMES).includes(message.name)) {
|
if (Object.values(MESSAGE_NAMES).includes(message.name)) {
|
||||||
@ -76,13 +77,13 @@ chrome.runtime.onMessage.addListener((message, _, sendResponse) => {
|
|||||||
messageName: message.name,
|
messageName: message.name,
|
||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
sendResponse({ hasError: false })
|
sendResponse({ hasError: false });
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
console.error(e)
|
console.error(e);
|
||||||
sendResponse({ hasError: true, message: e.toString() })
|
sendResponse({ hasError: true, message: e.toString() });
|
||||||
});
|
});
|
||||||
return true
|
return true;
|
||||||
}
|
}
|
||||||
return false
|
return false;
|
||||||
})
|
});
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
import { AtUri, BskyAgent, type AtpSessionData } from "@atproto/api";
|
import { AtUri, type AtpSessionData, BskyAgent } from "@atproto/api";
|
||||||
|
|
||||||
export type BskyLoginParams = {
|
export type BskyLoginParams = {
|
||||||
identifier: string;
|
identifier: string;
|
||||||
password: string;
|
password: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
export class BskyClient {
|
export class BskyClient {
|
||||||
private service = "https://bsky.social";
|
private service = "https://bsky.social";
|
||||||
@ -13,12 +13,15 @@ export class BskyClient {
|
|||||||
email: string;
|
email: string;
|
||||||
};
|
};
|
||||||
agent: BskyAgent;
|
agent: BskyAgent;
|
||||||
session = {}
|
session = {};
|
||||||
|
|
||||||
private constructor() {
|
private constructor() {
|
||||||
this.agent = new BskyAgent({ service: this.service, persistSession: (evt, session) => {
|
this.agent = new BskyAgent({
|
||||||
this.session = session
|
service: this.service,
|
||||||
} });
|
persistSession: (evt, session) => {
|
||||||
|
this.session = session;
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static createAgentFromSession(session: AtpSessionData): BskyClient {
|
public static createAgentFromSession(session: AtpSessionData): BskyClient {
|
||||||
@ -28,7 +31,7 @@ export class BskyClient {
|
|||||||
did: session.did,
|
did: session.did,
|
||||||
handle: session.handle,
|
handle: session.handle,
|
||||||
email: session.email,
|
email: session.email,
|
||||||
}
|
};
|
||||||
|
|
||||||
return client;
|
return client;
|
||||||
}
|
}
|
||||||
@ -38,15 +41,15 @@ export class BskyClient {
|
|||||||
password,
|
password,
|
||||||
}: BskyLoginParams): Promise<BskyClient> {
|
}: BskyLoginParams): Promise<BskyClient> {
|
||||||
const client = new BskyClient();
|
const client = new BskyClient();
|
||||||
const {data} = await client.agent.login({
|
const { data } = await client.agent.login({
|
||||||
identifier: identifier.replace(/^@/, ""), // if identifier is a handle name, @ is not required
|
identifier: identifier.replace(/^@/, ""), // if identifier is a handle name, @ is not required
|
||||||
password
|
password,
|
||||||
});
|
});
|
||||||
client.me = {
|
client.me = {
|
||||||
did: data.did,
|
did: data.did,
|
||||||
handle: data.handle,
|
handle: data.handle,
|
||||||
email: data.email,
|
email: data.email,
|
||||||
}
|
};
|
||||||
return client;
|
return client;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,30 +69,32 @@ export class BskyClient {
|
|||||||
|
|
||||||
public follow = async (subjectDid: string) => {
|
public follow = async (subjectDid: string) => {
|
||||||
return await this.agent.follow(subjectDid);
|
return await this.agent.follow(subjectDid);
|
||||||
}
|
};
|
||||||
|
|
||||||
public unfollow = async (followUri: string) => {
|
public unfollow = async (followUri: string) => {
|
||||||
return await this.agent.deleteFollow(followUri);
|
return await this.agent.deleteFollow(followUri);
|
||||||
}
|
};
|
||||||
|
|
||||||
public block = async (subjectDid: string) => {
|
public block = async (subjectDid: string) => {
|
||||||
return await this.agent.app.bsky.graph.block.create({
|
return await this.agent.app.bsky.graph.block.create(
|
||||||
repo: this.me.did,
|
{
|
||||||
collection: "app.bsky.graph.block",
|
repo: this.me.did,
|
||||||
},
|
collection: "app.bsky.graph.block",
|
||||||
{
|
},
|
||||||
subject: subjectDid,
|
{
|
||||||
createdAt: new Date().toISOString(),
|
subject: subjectDid,
|
||||||
})
|
createdAt: new Date().toISOString(),
|
||||||
}
|
},
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
public unblock = async (blockUri: string) => {
|
public unblock = async (blockUri: string) => {
|
||||||
// TODO: unblock is not working. Need to fix it.
|
// TODO: unblock is not working. Need to fix it.
|
||||||
const {rkey} = new AtUri(blockUri)
|
const { rkey } = new AtUri(blockUri);
|
||||||
return await this.agent.app.bsky.graph.block.delete({
|
return await this.agent.app.bsky.graph.block.delete({
|
||||||
repo: this.me.did,
|
repo: this.me.did,
|
||||||
collection: "app.bsky.graph.block",
|
collection: "app.bsky.graph.block",
|
||||||
rkey,
|
rkey,
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,53 +1,76 @@
|
|||||||
import type { ProfileView } from "@atproto/api/dist/client/types/app/bsky/actor/defs"
|
import type { ProfileView } from "@atproto/api/dist/client/types/app/bsky/actor/defs";
|
||||||
import { BSKY_USER_MATCH_TYPE } from "./constants"
|
import { BSKY_USER_MATCH_TYPE } from "./constants";
|
||||||
|
|
||||||
type Names = {
|
type Names = {
|
||||||
accountName: string,
|
accountName: string;
|
||||||
accountNameRemoveUnderscore: string,
|
accountNameRemoveUnderscore: string;
|
||||||
displayName: string,
|
displayName: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
export const isSimilarUser = (names: Names, bskyProfile: ProfileView | undefined): {
|
export const isSimilarUser = (
|
||||||
isSimilar: boolean,
|
names: Names,
|
||||||
type: typeof BSKY_USER_MATCH_TYPE[keyof typeof BSKY_USER_MATCH_TYPE],
|
bskyProfile: ProfileView | undefined,
|
||||||
|
): {
|
||||||
|
isSimilar: boolean;
|
||||||
|
type: (typeof BSKY_USER_MATCH_TYPE)[keyof typeof BSKY_USER_MATCH_TYPE];
|
||||||
} => {
|
} => {
|
||||||
if (!bskyProfile) {
|
if (!bskyProfile) {
|
||||||
return {
|
return {
|
||||||
isSimilar: false,
|
isSimilar: false,
|
||||||
type: BSKY_USER_MATCH_TYPE.NONE,
|
type: BSKY_USER_MATCH_TYPE.NONE,
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const lowerCaseNames = Object.entries(names).reduce<Names>((acc, [key, value]) => {
|
const lowerCaseNames = Object.entries(names).reduce<Names>(
|
||||||
acc[key] = value.toLowerCase();
|
(acc, [key, value]) => {
|
||||||
return acc;
|
acc[key] = value.toLowerCase();
|
||||||
}, {} as Names);
|
return acc;
|
||||||
|
},
|
||||||
|
{} as Names,
|
||||||
|
);
|
||||||
|
|
||||||
const bskyHandle = bskyProfile.handle.toLocaleLowerCase().replace("@", "").split('.')[0];
|
const bskyHandle = bskyProfile.handle
|
||||||
|
.toLocaleLowerCase()
|
||||||
|
.replace("@", "")
|
||||||
|
.split(".")[0];
|
||||||
|
|
||||||
if (lowerCaseNames.accountName === bskyHandle || lowerCaseNames.accountNameRemoveUnderscore === bskyHandle) {
|
if (
|
||||||
|
lowerCaseNames.accountName === bskyHandle ||
|
||||||
|
lowerCaseNames.accountNameRemoveUnderscore === bskyHandle
|
||||||
|
) {
|
||||||
return {
|
return {
|
||||||
isSimilar: true,
|
isSimilar: true,
|
||||||
type: BSKY_USER_MATCH_TYPE.HANDLE,
|
type: BSKY_USER_MATCH_TYPE.HANDLE,
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lowerCaseNames.displayName === bskyProfile.displayName?.toLocaleLowerCase()) {
|
if (
|
||||||
|
lowerCaseNames.displayName === bskyProfile.displayName?.toLocaleLowerCase()
|
||||||
|
) {
|
||||||
return {
|
return {
|
||||||
isSimilar: true,
|
isSimilar: true,
|
||||||
type: BSKY_USER_MATCH_TYPE.DISPLAY_NAME,
|
type: BSKY_USER_MATCH_TYPE.DISPLAY_NAME,
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bskyProfile.description?.toLocaleLowerCase().includes(`@${lowerCaseNames.accountName}`) && !['pfp ', 'pfp: ', 'pfp by '].some(t => bskyProfile.description.toLocaleLowerCase().includes(`${t}@${lowerCaseNames.accountName}`))) {
|
if (
|
||||||
|
bskyProfile.description
|
||||||
|
?.toLocaleLowerCase()
|
||||||
|
.includes(`@${lowerCaseNames.accountName}`) &&
|
||||||
|
!["pfp ", "pfp: ", "pfp by "].some((t) =>
|
||||||
|
bskyProfile.description
|
||||||
|
.toLocaleLowerCase()
|
||||||
|
.includes(`${t}@${lowerCaseNames.accountName}`),
|
||||||
|
)
|
||||||
|
) {
|
||||||
return {
|
return {
|
||||||
isSimilar: true,
|
isSimilar: true,
|
||||||
type: BSKY_USER_MATCH_TYPE.DESCRIPTION,
|
type: BSKY_USER_MATCH_TYPE.DESCRIPTION,
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isSimilar: false,
|
isSimilar: false,
|
||||||
type: BSKY_USER_MATCH_TYPE.NONE,
|
type: BSKY_USER_MATCH_TYPE.NONE,
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
|
|||||||
@ -3,13 +3,12 @@ import { sendToBackground } from "@plasmohq/messaging";
|
|||||||
export type BskyLoginParams = {
|
export type BskyLoginParams = {
|
||||||
identifier: string;
|
identifier: string;
|
||||||
password: string;
|
password: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
export class BskyServiceWorkerClient {
|
export class BskyServiceWorkerClient {
|
||||||
private session = {}
|
private session = {};
|
||||||
|
|
||||||
private constructor() {
|
private constructor() {}
|
||||||
}
|
|
||||||
|
|
||||||
public static async createAgent({
|
public static async createAgent({
|
||||||
identifier,
|
identifier,
|
||||||
@ -21,11 +20,11 @@ export class BskyServiceWorkerClient {
|
|||||||
body: {
|
body: {
|
||||||
identifier,
|
identifier,
|
||||||
password,
|
password,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if(error) throw new Error(error.message)
|
if (error) throw new Error(error.message);
|
||||||
|
|
||||||
client.session = session
|
client.session = session;
|
||||||
return client;
|
return client;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,9 +41,9 @@ export class BskyServiceWorkerClient {
|
|||||||
session: this.session,
|
session: this.session,
|
||||||
term,
|
term,
|
||||||
limit,
|
limit,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if(error) throw new Error(error.message)
|
if (error) throw new Error(error.message);
|
||||||
|
|
||||||
return actors;
|
return actors;
|
||||||
};
|
};
|
||||||
@ -54,39 +53,39 @@ export class BskyServiceWorkerClient {
|
|||||||
name: "follow",
|
name: "follow",
|
||||||
body: {
|
body: {
|
||||||
session: this.session,
|
session: this.session,
|
||||||
subjectDid
|
subjectDid,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if(error) throw new Error(error.message)
|
if (error) throw new Error(error.message);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
};
|
||||||
|
|
||||||
public unfollow = async (followUri: string) => {
|
public unfollow = async (followUri: string) => {
|
||||||
const { result, error } = await sendToBackground({
|
const { result, error } = await sendToBackground({
|
||||||
name: "unfollow",
|
name: "unfollow",
|
||||||
body: {
|
body: {
|
||||||
session: this.session,
|
session: this.session,
|
||||||
followUri
|
followUri,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if(error) throw new Error(error.message)
|
if (error) throw new Error(error.message);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
};
|
||||||
|
|
||||||
public block = async (subjectDid: string) => {
|
public block = async (subjectDid: string) => {
|
||||||
const { result, error } = await sendToBackground({
|
const { result, error } = await sendToBackground({
|
||||||
name: "block",
|
name: "block",
|
||||||
body: {
|
body: {
|
||||||
session: this.session,
|
session: this.session,
|
||||||
subjectDid
|
subjectDid,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if(error) throw new Error(error.message)
|
if (error) throw new Error(error.message);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
};
|
||||||
|
|
||||||
public unblock = async (blockUri: string) => {
|
public unblock = async (blockUri: string) => {
|
||||||
// TODO: unblock is not working. Need to fix it.
|
// TODO: unblock is not working. Need to fix it.
|
||||||
@ -94,11 +93,11 @@ export class BskyServiceWorkerClient {
|
|||||||
name: "unblock",
|
name: "unblock",
|
||||||
body: {
|
body: {
|
||||||
session: this.session,
|
session: this.session,
|
||||||
blockUri
|
blockUri,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if(error) throw new Error(error.message)
|
if (error) throw new Error(error.message);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,110 +1,145 @@
|
|||||||
import type { ProfileView, ViewerState } from "@atproto/api/dist/client/types/app/bsky/actor/defs"
|
import type {
|
||||||
import { P, match } from "ts-pattern"
|
ProfileView,
|
||||||
import van from 'vanjs-core'
|
ViewerState,
|
||||||
import { BSKY_USER_MATCH_TYPE } from "~lib/constants"
|
} from "@atproto/api/dist/client/types/app/bsky/actor/defs";
|
||||||
|
import { P, match } from "ts-pattern";
|
||||||
|
import van from "vanjs-core";
|
||||||
|
import { BSKY_USER_MATCH_TYPE } from "~lib/constants";
|
||||||
|
|
||||||
|
const { a, div, p, img, button, span } = van.tags;
|
||||||
const { a, div, p, img, button, span } = van.tags
|
const { svg, path } = van.tagsNS("http://www.w3.org/2000/svg");
|
||||||
const { svg, path } = van.tagsNS("http://www.w3.org/2000/svg")
|
|
||||||
|
|
||||||
export type UserCellBtnLabel = {
|
export type UserCellBtnLabel = {
|
||||||
add: string,
|
add: string;
|
||||||
remove: string,
|
remove: string;
|
||||||
progressive: string,
|
progressive: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
const ActionButton = ({ statusKey, profile, btnLabel, addAction, removeAction }: {
|
const ActionButton = ({
|
||||||
profile: ProfileView,
|
statusKey,
|
||||||
statusKey: keyof ViewerState,
|
profile,
|
||||||
btnLabel: UserCellBtnLabel,
|
btnLabel,
|
||||||
addAction: () => Promise<void>,
|
addAction,
|
||||||
removeAction: () => Promise<void>
|
removeAction,
|
||||||
|
}: {
|
||||||
|
profile: ProfileView;
|
||||||
|
statusKey: keyof ViewerState;
|
||||||
|
btnLabel: UserCellBtnLabel;
|
||||||
|
addAction: () => Promise<void>;
|
||||||
|
removeAction: () => Promise<void>;
|
||||||
}) => {
|
}) => {
|
||||||
const label = van.state(`${profile.viewer[statusKey] ? btnLabel.progressive : btnLabel.add} on Bluesky`)
|
const label = van.state(
|
||||||
|
`${
|
||||||
|
profile.viewer[statusKey] ? btnLabel.progressive : btnLabel.add
|
||||||
|
} on Bluesky`,
|
||||||
|
);
|
||||||
|
|
||||||
const isStateOfBeing = van.state(profile.viewer[statusKey])
|
const isStateOfBeing = van.state(profile.viewer[statusKey]);
|
||||||
const isProcessing = van.state(false)
|
const isProcessing = van.state(false);
|
||||||
const isJustApplied = van.state(false)
|
const isJustApplied = van.state(false);
|
||||||
|
|
||||||
const beingClass = van.derive(() => isStateOfBeing.val ? "action-button__being" : "")
|
const beingClass = van.derive(() =>
|
||||||
const processingClass = van.derive(() => isProcessing.val ? "action-button__processing" : "")
|
isStateOfBeing.val ? "action-button__being" : "",
|
||||||
const justAppliedClass = van.derive(() => isJustApplied.val ? "action-button__just-applied" : "")
|
);
|
||||||
|
const processingClass = van.derive(() =>
|
||||||
|
isProcessing.val ? "action-button__processing" : "",
|
||||||
|
);
|
||||||
|
const justAppliedClass = van.derive(() =>
|
||||||
|
isJustApplied.val ? "action-button__just-applied" : "",
|
||||||
|
);
|
||||||
|
|
||||||
const onClick = async () => {
|
const onClick = async () => {
|
||||||
if (isProcessing.val) return
|
if (isProcessing.val) return;
|
||||||
isProcessing.val = true
|
isProcessing.val = true;
|
||||||
label.val = "Processing..."
|
label.val = "Processing...";
|
||||||
|
|
||||||
if (isStateOfBeing.val) {
|
if (isStateOfBeing.val) {
|
||||||
await removeAction()
|
await removeAction();
|
||||||
label.val = `${btnLabel.add} on Bluesky`
|
label.val = `${btnLabel.add} on Bluesky`;
|
||||||
isStateOfBeing.val = false
|
isStateOfBeing.val = false;
|
||||||
} else {
|
} else {
|
||||||
await addAction()
|
await addAction();
|
||||||
label.val = `${btnLabel.progressive} on Bluesky`
|
label.val = `${btnLabel.progressive} on Bluesky`;
|
||||||
isStateOfBeing.val = true
|
isStateOfBeing.val = true;
|
||||||
isJustApplied.val = true
|
isJustApplied.val = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
isProcessing.val = false
|
isProcessing.val = false;
|
||||||
}
|
};
|
||||||
|
|
||||||
const onMouseover = () => {
|
const onMouseover = () => {
|
||||||
if (
|
if (isProcessing.val || isJustApplied.val || !isStateOfBeing.val) return;
|
||||||
isProcessing.val ||
|
|
||||||
isJustApplied.val ||
|
|
||||||
!isStateOfBeing.val
|
|
||||||
) return
|
|
||||||
|
|
||||||
label.val = `${btnLabel.remove} on Bluesky`
|
label.val = `${btnLabel.remove} on Bluesky`;
|
||||||
}
|
};
|
||||||
|
|
||||||
const onMouseout = () => {
|
const onMouseout = () => {
|
||||||
if (isJustApplied.val) {
|
if (isJustApplied.val) {
|
||||||
isJustApplied.val = false
|
isJustApplied.val = false;
|
||||||
}
|
}
|
||||||
if (!isStateOfBeing.val) return
|
if (!isStateOfBeing.val) return;
|
||||||
|
|
||||||
label.val = `${btnLabel.progressive} on Bluesky`
|
label.val = `${btnLabel.progressive} on Bluesky`;
|
||||||
}
|
};
|
||||||
|
|
||||||
return button({
|
return button(
|
||||||
class: () => `action-button ${beingClass.val} ${processingClass.val} ${justAppliedClass.val}`,
|
{
|
||||||
onclick: onClick,
|
class: () =>
|
||||||
onmouseover: onMouseover,
|
`action-button ${beingClass.val} ${processingClass.val} ${justAppliedClass.val}`,
|
||||||
onmouseout: onMouseout,
|
onclick: onClick,
|
||||||
},
|
onmouseover: onMouseover,
|
||||||
|
onmouseout: onMouseout,
|
||||||
|
},
|
||||||
() => label.val,
|
() => label.val,
|
||||||
)
|
);
|
||||||
}
|
};
|
||||||
|
|
||||||
const Avatar = ({ avatar }: { avatar?: string }) => {
|
const Avatar = ({ avatar }: { avatar?: string }) => {
|
||||||
return avatar ? img({ src: avatar, width: "40" }) : div({ class: "no-avatar" })
|
return avatar
|
||||||
}
|
? img({ src: avatar, width: "40" })
|
||||||
|
: div({ class: "no-avatar" });
|
||||||
|
};
|
||||||
|
|
||||||
const MatchTypeLabel = ({ matchType }: { matchType: typeof BSKY_USER_MATCH_TYPE[keyof typeof BSKY_USER_MATCH_TYPE] }) => {
|
const MatchTypeLabel = ({
|
||||||
|
matchType,
|
||||||
|
}: {
|
||||||
|
matchType: (typeof BSKY_USER_MATCH_TYPE)[keyof typeof BSKY_USER_MATCH_TYPE];
|
||||||
|
}) => {
|
||||||
const [text, labelClass] = match(matchType)
|
const [text, labelClass] = match(matchType)
|
||||||
.with(
|
.with(BSKY_USER_MATCH_TYPE.HANDLE, () => [
|
||||||
BSKY_USER_MATCH_TYPE.HANDLE,
|
"Same handle name",
|
||||||
() => ["Same handle name", "match-type__handle"]
|
"match-type__handle",
|
||||||
)
|
])
|
||||||
.with(
|
.with(BSKY_USER_MATCH_TYPE.DISPLAY_NAME, () => [
|
||||||
BSKY_USER_MATCH_TYPE.DISPLAY_NAME,
|
"Same display name",
|
||||||
() => ["Same display name", "match-type__display-name"]
|
"match-type__display-name",
|
||||||
)
|
])
|
||||||
.with(
|
.with(BSKY_USER_MATCH_TYPE.DESCRIPTION, () => [
|
||||||
BSKY_USER_MATCH_TYPE.DESCRIPTION,
|
"Included handle name in description",
|
||||||
() => ["Included handle name in description", "match-type__description"]
|
"match-type__description",
|
||||||
)
|
])
|
||||||
.run()
|
.run();
|
||||||
|
|
||||||
return div({ class: `match-type ${labelClass}` },
|
return div(
|
||||||
svg({ fill: "none", width: "12", viewBox: "0 0 24 24", "stroke-width": "3", stroke: "currentColor", class: "w-6 h-6" },
|
{ class: `match-type ${labelClass}` },
|
||||||
path({ "stroke-linecap": "round", "stroke-linejoin": "round", "d": "M4.5 12.75l6 6 9-13.5" }),
|
svg(
|
||||||
|
{
|
||||||
|
fill: "none",
|
||||||
|
width: "12",
|
||||||
|
viewBox: "0 0 24 24",
|
||||||
|
"stroke-width": "3",
|
||||||
|
stroke: "currentColor",
|
||||||
|
class: "w-6 h-6",
|
||||||
|
},
|
||||||
|
path({
|
||||||
|
"stroke-linecap": "round",
|
||||||
|
"stroke-linejoin": "round",
|
||||||
|
d: "M4.5 12.75l6 6 9-13.5",
|
||||||
|
}),
|
||||||
),
|
),
|
||||||
text
|
text,
|
||||||
)
|
);
|
||||||
}
|
};
|
||||||
|
|
||||||
export const BskyUserCell = ({
|
export const BskyUserCell = ({
|
||||||
profile,
|
profile,
|
||||||
@ -114,32 +149,46 @@ export const BskyUserCell = ({
|
|||||||
addAction,
|
addAction,
|
||||||
removeAction,
|
removeAction,
|
||||||
}: {
|
}: {
|
||||||
profile: ProfileView,
|
profile: ProfileView;
|
||||||
statusKey: keyof ViewerState,
|
statusKey: keyof ViewerState;
|
||||||
btnLabel: UserCellBtnLabel,
|
btnLabel: UserCellBtnLabel;
|
||||||
matchType: typeof BSKY_USER_MATCH_TYPE[keyof typeof BSKY_USER_MATCH_TYPE],
|
matchType: (typeof BSKY_USER_MATCH_TYPE)[keyof typeof BSKY_USER_MATCH_TYPE];
|
||||||
addAction: () => Promise<void>,
|
addAction: () => Promise<void>;
|
||||||
removeAction: () => Promise<void>
|
removeAction: () => Promise<void>;
|
||||||
}) => {
|
}) => {
|
||||||
return div({ class: "bsky-user-content-wrapper" },
|
return div(
|
||||||
|
{ class: "bsky-user-content-wrapper" },
|
||||||
MatchTypeLabel({ matchType }),
|
MatchTypeLabel({ matchType }),
|
||||||
div({ class: "bsky-user-content bsky-fade-in" },
|
div(
|
||||||
div({ class: "icon-section" },
|
{ class: "bsky-user-content bsky-fade-in" },
|
||||||
a({ href: `https://bsky.app/profile/${profile.handle}`, target: "_blank", rel: "noopener" },
|
div(
|
||||||
|
{ class: "icon-section" },
|
||||||
|
a(
|
||||||
|
{
|
||||||
|
href: `https://bsky.app/profile/${profile.handle}`,
|
||||||
|
target: "_blank",
|
||||||
|
rel: "noopener",
|
||||||
|
},
|
||||||
Avatar({ avatar: profile.avatar }),
|
Avatar({ avatar: profile.avatar }),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
div({ class: "content" },
|
div(
|
||||||
div({ class: "name-and-controller" },
|
{ class: "content" },
|
||||||
|
div(
|
||||||
|
{ class: "name-and-controller" },
|
||||||
div(
|
div(
|
||||||
p({ class: "display-name" },
|
p(
|
||||||
a({ href: `https://bsky.app/profile/${profile.handle}`, target: "_blank", rel: "noopener" },
|
{ class: "display-name" },
|
||||||
|
a(
|
||||||
|
{
|
||||||
|
href: `https://bsky.app/profile/${profile.handle}`,
|
||||||
|
target: "_blank",
|
||||||
|
rel: "noopener",
|
||||||
|
},
|
||||||
profile.displayName ?? profile.handle,
|
profile.displayName ?? profile.handle,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
p({ class: "handle" },
|
p({ class: "handle" }, `@${profile.handle}`),
|
||||||
`@${profile.handle}`,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
div(
|
div(
|
||||||
ActionButton({
|
ActionButton({
|
||||||
@ -148,10 +197,13 @@ export const BskyUserCell = ({
|
|||||||
btnLabel,
|
btnLabel,
|
||||||
addAction,
|
addAction,
|
||||||
removeAction,
|
removeAction,
|
||||||
})
|
}),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
profile.description ? p({ class: "description" }, profile.description) : "",
|
profile.description
|
||||||
|
? p({ class: "description" }, profile.description)
|
||||||
|
: "",
|
||||||
),
|
),
|
||||||
))
|
),
|
||||||
}
|
);
|
||||||
|
};
|
||||||
|
|||||||
@ -1,30 +1,35 @@
|
|||||||
|
import van from "vanjs-core";
|
||||||
|
|
||||||
import van from "vanjs-core"
|
const { div, p } = van.tags;
|
||||||
|
const { svg, path } = van.tagsNS("http://www.w3.org/2000/svg");
|
||||||
|
|
||||||
const { div, p } = van.tags
|
const WarningIcon = () =>
|
||||||
const { svg, path } = van.tagsNS("http://www.w3.org/2000/svg")
|
svg(
|
||||||
|
{
|
||||||
const WarningIcon = () => svg(
|
fill: "none",
|
||||||
{
|
"stroke-width": "1.5",
|
||||||
fill: "none",
|
stroke: "currentColor",
|
||||||
"stroke-width": "1.5",
|
class: "w-6 h-6",
|
||||||
stroke: "currentColor",
|
viewBox: "0 0 24 24",
|
||||||
class: "w-6 h-6",
|
|
||||||
viewBox: "0 0 24 24"
|
|
||||||
},
|
|
||||||
path({
|
|
||||||
"stroke-linecap": "round",
|
|
||||||
"stroke-linejoin": "round",
|
|
||||||
d: "M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
|
|
||||||
export const NotFoundCell = () => div({ class: "bsky-user-content-wrapper" },
|
|
||||||
div({ class: "bsky-user-content bsky-user-content__not-found bsky-fade-in" },
|
|
||||||
WarningIcon(),
|
|
||||||
p({
|
|
||||||
class: "not-found"
|
|
||||||
},
|
},
|
||||||
"No similar users found."
|
path({
|
||||||
)
|
"stroke-linecap": "round",
|
||||||
))
|
"stroke-linejoin": "round",
|
||||||
|
d: "M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
export const NotFoundCell = () =>
|
||||||
|
div(
|
||||||
|
{ class: "bsky-user-content-wrapper" },
|
||||||
|
div(
|
||||||
|
{ class: "bsky-user-content bsky-user-content__not-found bsky-fade-in" },
|
||||||
|
WarningIcon(),
|
||||||
|
p(
|
||||||
|
{
|
||||||
|
class: "not-found",
|
||||||
|
},
|
||||||
|
"No similar users found.",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|||||||
@ -1,19 +1,24 @@
|
|||||||
import van from "vanjs-core"
|
import van from "vanjs-core";
|
||||||
|
|
||||||
const { button, div } = van.tags
|
const { button, div } = van.tags;
|
||||||
|
|
||||||
export const ReloadButton = ({clickAction}: {clickAction: () => void}) => {
|
export const ReloadButton = ({ clickAction }: { clickAction: () => void }) => {
|
||||||
const deleted = van.state(false)
|
const deleted = van.state(false);
|
||||||
|
|
||||||
return () => deleted.val ? null : div({ class: "bsky-reload-btn-wrapper" },
|
return () =>
|
||||||
button(
|
deleted.val
|
||||||
{
|
? null
|
||||||
class: "bsky-reload-btn bsky-fade-in",
|
: div(
|
||||||
onclick: () => {
|
{ class: "bsky-reload-btn-wrapper" },
|
||||||
clickAction()
|
button(
|
||||||
deleted.val = true
|
{
|
||||||
}
|
class: "bsky-reload-btn bsky-fade-in",
|
||||||
},
|
onclick: () => {
|
||||||
"Find More"
|
clickAction();
|
||||||
))
|
deleted.val = true;
|
||||||
}
|
},
|
||||||
|
},
|
||||||
|
"Find More",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|||||||
@ -1,37 +1,37 @@
|
|||||||
export const MESSAGE_NAMES = {
|
export const MESSAGE_NAMES = {
|
||||||
SEARCH_BSKY_USER_ON_FOLLOW_PAGE: "search_bsky_user_on_follow_page",
|
SEARCH_BSKY_USER_ON_FOLLOW_PAGE: "search_bsky_user_on_follow_page",
|
||||||
SEARCH_BSKY_USER_ON_LIST_MEMBERS_PAGE: "search_bsky_user_on_list_members_page",
|
SEARCH_BSKY_USER_ON_LIST_MEMBERS_PAGE:
|
||||||
|
"search_bsky_user_on_list_members_page",
|
||||||
SEARCH_BSKY_USER_ON_BLOCK_PAGE: "search_bsky_user_on_block_page",
|
SEARCH_BSKY_USER_ON_BLOCK_PAGE: "search_bsky_user_on_block_page",
|
||||||
}
|
};
|
||||||
|
|
||||||
const STORAGE_PREFIX = "sky_follower_bridge_storage"
|
const STORAGE_PREFIX = "sky_follower_bridge_storage";
|
||||||
export const STORAGE_KEYS = {
|
export const STORAGE_KEYS = {
|
||||||
BSKY_USER_ID: `${STORAGE_PREFIX}_bsky_password`,
|
BSKY_USER_ID: `${STORAGE_PREFIX}_bsky_password`,
|
||||||
BSKY_PASSWORD: `${STORAGE_PREFIX}_bsky_user`,
|
BSKY_PASSWORD: `${STORAGE_PREFIX}_bsky_user`,
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
export const TARGET_URLS_REGEX = {
|
export const TARGET_URLS_REGEX = {
|
||||||
FOLLOW: /https:\/\/(twitter|x)\.com\/[^/]+\/(verified_follow|follow)/,
|
FOLLOW: /https:\/\/(twitter|x)\.com\/[^/]+\/(verified_follow|follow)/,
|
||||||
LIST: /^https:\/\/(twitter|x)\.com\/[^/]+\/lists\/[^/]+\/members/,
|
LIST: /^https:\/\/(twitter|x)\.com\/[^/]+\/lists\/[^/]+\/members/,
|
||||||
BLOCK: /^https:\/\/(twitter|x)\.com\/settings\/blocked/,
|
BLOCK: /^https:\/\/(twitter|x)\.com\/settings\/blocked/,
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
export const MESSAGE_TYPE = {
|
export const MESSAGE_TYPE = {
|
||||||
ERROR: "error",
|
ERROR: "error",
|
||||||
SUCCESS: "success",
|
SUCCESS: "success",
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
export const VIEWER_STATE = {
|
export const VIEWER_STATE = {
|
||||||
BLOCKING: "blocking",
|
BLOCKING: "blocking",
|
||||||
FOLLOWING: "following",
|
FOLLOWING: "following",
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
|
|
||||||
export const BSKY_USER_MATCH_TYPE = {
|
export const BSKY_USER_MATCH_TYPE = {
|
||||||
HANDLE: "handle",
|
HANDLE: "handle",
|
||||||
DISPLAY_NAME: "display_name",
|
DISPLAY_NAME: "display_name",
|
||||||
DESCRIPTION: "description",
|
DESCRIPTION: "description",
|
||||||
NONE: "none",
|
NONE: "none",
|
||||||
} as const
|
} as const;
|
||||||
|
|
||||||
export const MAX_RELOAD_COUNT = 1
|
export const MAX_RELOAD_COUNT = 1;
|
||||||
|
|||||||
@ -1,67 +1,91 @@
|
|||||||
import type { ProfileView, ViewerState } from "@atproto/api/dist/client/types/app/bsky/actor/defs"
|
import type {
|
||||||
import van from "vanjs-core"
|
ProfileView,
|
||||||
import { ReloadButton } from "./components/ReloadBtn"
|
ViewerState,
|
||||||
import { NotFoundCell } from "./components/NotFoundCell"
|
} from "@atproto/api/dist/client/types/app/bsky/actor/defs";
|
||||||
import { BskyUserCell, type UserCellBtnLabel } from "./components/BskyUserCell"
|
import van from "vanjs-core";
|
||||||
import type { BSKY_USER_MATCH_TYPE } from "./constants"
|
import { BskyUserCell, type UserCellBtnLabel } from "./components/BskyUserCell";
|
||||||
|
import { NotFoundCell } from "./components/NotFoundCell";
|
||||||
|
import { ReloadButton } from "./components/ReloadBtn";
|
||||||
|
import type { BSKY_USER_MATCH_TYPE } from "./constants";
|
||||||
|
|
||||||
export const getUserCells = ({ queryParam, filterInsertedElement }: { queryParam: string, filterInsertedElement: boolean }) => {
|
export const getUserCells = ({
|
||||||
|
queryParam,
|
||||||
|
filterInsertedElement,
|
||||||
|
}: { queryParam: string; filterInsertedElement: boolean }) => {
|
||||||
const userCells = document.querySelectorAll(queryParam);
|
const userCells = document.querySelectorAll(queryParam);
|
||||||
|
|
||||||
// filter out already inserted elements
|
// filter out already inserted elements
|
||||||
if (filterInsertedElement) {
|
if (filterInsertedElement) {
|
||||||
return Array.from(userCells).filter((userCell) => {
|
return Array.from(userCells).filter((userCell) => {
|
||||||
const nextElement = userCell.nextElementSibling
|
const nextElement = userCell.nextElementSibling;
|
||||||
if (!nextElement) { return true }
|
if (!nextElement) {
|
||||||
return nextElement.classList.contains("bsky-user-content-wrapper") === false
|
return true;
|
||||||
})
|
}
|
||||||
} else {
|
return (
|
||||||
return Array.from(userCells)
|
nextElement.classList.contains("bsky-user-content-wrapper") === false
|
||||||
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
return Array.from(userCells);
|
||||||
|
};
|
||||||
|
|
||||||
export const insertReloadEl = (clickAction: () => void) => {
|
export const insertReloadEl = (clickAction: () => void) => {
|
||||||
const lastInsertedEl = Array.from(document.querySelectorAll('.bsky-user-content')).at(-1)
|
const lastInsertedEl = Array.from(
|
||||||
van.add(lastInsertedEl.parentElement, ReloadButton({clickAction}))
|
document.querySelectorAll(".bsky-user-content"),
|
||||||
}
|
).at(-1);
|
||||||
|
van.add(lastInsertedEl.parentElement, ReloadButton({ clickAction }));
|
||||||
|
};
|
||||||
|
|
||||||
export const removeReloadEl = () => {
|
export const removeReloadEl = () => {
|
||||||
const reloadEl = document.querySelectorAll('.bsky-reload-btn-wrapper')
|
const reloadEl = document.querySelectorAll(".bsky-reload-btn-wrapper");
|
||||||
reloadEl.forEach(el => el.remove())
|
for (const el of reloadEl) {
|
||||||
}
|
el.remove();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export const getAccountNameAndDisplayName = (userCell: Element) => {
|
export const getAccountNameAndDisplayName = (userCell: Element) => {
|
||||||
const [avatarEl, displayNameEl] = userCell?.querySelectorAll("a")
|
const [avatarEl, displayNameEl] = userCell.querySelectorAll("a");
|
||||||
const twAccountName = avatarEl?.getAttribute("href")?.replace("/", "")
|
const twAccountName = avatarEl?.getAttribute("href")?.replace("/", "");
|
||||||
const twAccountNameRemoveUnderscore = twAccountName.replaceAll("_", "") // bsky does not allow underscores in handle, so remove them.
|
const twAccountNameRemoveUnderscore = twAccountName.replaceAll("_", ""); // bsky does not allow underscores in handle, so remove them.
|
||||||
const twDisplayName = displayNameEl?.textContent
|
const twDisplayName = displayNameEl?.textContent;
|
||||||
return { twAccountName, twDisplayName, twAccountNameRemoveUnderscore }
|
return { twAccountName, twDisplayName, twAccountNameRemoveUnderscore };
|
||||||
}
|
};
|
||||||
|
|
||||||
export const insertBskyProfileEl = ({ dom, profile, statusKey, btnLabel, matchType, addAction, removeAction }: {
|
export const insertBskyProfileEl = ({
|
||||||
dom: Element,
|
dom,
|
||||||
profile: ProfileView,
|
profile,
|
||||||
statusKey: keyof ViewerState,
|
statusKey,
|
||||||
btnLabel: UserCellBtnLabel,
|
btnLabel,
|
||||||
matchType: typeof BSKY_USER_MATCH_TYPE[keyof typeof BSKY_USER_MATCH_TYPE],
|
matchType,
|
||||||
addAction: () => Promise<void>,
|
addAction,
|
||||||
removeAction: () => Promise<void>
|
removeAction,
|
||||||
|
}: {
|
||||||
|
dom: Element;
|
||||||
|
profile: ProfileView;
|
||||||
|
statusKey: keyof ViewerState;
|
||||||
|
btnLabel: UserCellBtnLabel;
|
||||||
|
matchType: (typeof BSKY_USER_MATCH_TYPE)[keyof typeof BSKY_USER_MATCH_TYPE];
|
||||||
|
addAction: () => Promise<void>;
|
||||||
|
removeAction: () => Promise<void>;
|
||||||
}) => {
|
}) => {
|
||||||
van.add(dom.parentElement, BskyUserCell({
|
van.add(
|
||||||
profile,
|
dom.parentElement,
|
||||||
statusKey,
|
BskyUserCell({
|
||||||
btnLabel,
|
profile,
|
||||||
matchType,
|
statusKey,
|
||||||
addAction,
|
btnLabel,
|
||||||
removeAction,
|
matchType,
|
||||||
}))
|
addAction,
|
||||||
}
|
removeAction,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const insertNotFoundEl = (dom: Element) => {
|
export const insertNotFoundEl = (dom: Element) => {
|
||||||
van.add(dom.parentElement, NotFoundCell())
|
van.add(dom.parentElement, NotFoundCell());
|
||||||
}
|
};
|
||||||
|
|
||||||
export const isOutOfTopViewport = (el: Element) => {
|
export const isOutOfTopViewport = (el: Element) => {
|
||||||
const rect = el.getBoundingClientRect();
|
const rect = el.getBoundingClientRect();
|
||||||
return rect.top < 0
|
return rect.top < 0;
|
||||||
}
|
};
|
||||||
|
|||||||
@ -1,92 +1,98 @@
|
|||||||
import { isOutOfTopViewport, removeReloadEl } from './domHelpers';
|
import type { ViewerState } from "@atproto/api/dist/client/types/app/bsky/actor/defs";
|
||||||
import { getAccountNameAndDisplayName, getUserCells, insertBskyProfileEl, insertNotFoundEl, insertReloadEl } from "~lib/domHelpers";
|
|
||||||
import { isSimilarUser } from "~lib/bskyHelpers";
|
import { isSimilarUser } from "~lib/bskyHelpers";
|
||||||
|
import {
|
||||||
|
getAccountNameAndDisplayName,
|
||||||
|
getUserCells,
|
||||||
|
insertBskyProfileEl,
|
||||||
|
insertNotFoundEl,
|
||||||
|
insertReloadEl,
|
||||||
|
} from "~lib/domHelpers";
|
||||||
import { debugLog, isOneSymbol } from "~lib/utils";
|
import { debugLog, isOneSymbol } from "~lib/utils";
|
||||||
import type { BskyClient } from './bskyClient';
|
import type { BskyClient } from "./bskyClient";
|
||||||
import type { ViewerState } from '@atproto/api/dist/client/types/app/bsky/actor/defs';
|
import type { BskyServiceWorkerClient } from "./bskyServiceWorkerClient";
|
||||||
import type { UserCellBtnLabel } from './components/BskyUserCell';
|
import type { UserCellBtnLabel } from "./components/BskyUserCell";
|
||||||
import type { BskyServiceWorkerClient } from './bskyServiceWorkerClient';
|
import { isOutOfTopViewport, removeReloadEl } from "./domHelpers";
|
||||||
|
|
||||||
|
const notFoundUserCache = new Set<string>();
|
||||||
|
|
||||||
const notFoundUserCache = new Set<string>()
|
const bskyUserUrlMap = new Map<string, string>();
|
||||||
|
|
||||||
const bskyUserUrlMap = new Map<string, string>()
|
export const searchAndInsertBskyUsers = async ({
|
||||||
|
agent,
|
||||||
export const searchAndInsertBskyUsers = async (
|
btnLabel,
|
||||||
{
|
userCellQueryParam,
|
||||||
agent,
|
statusKey,
|
||||||
btnLabel,
|
addQuery,
|
||||||
userCellQueryParam,
|
removeQuery,
|
||||||
statusKey,
|
}: {
|
||||||
addQuery,
|
agent: BskyServiceWorkerClient | BskyClient;
|
||||||
removeQuery,
|
userCellQueryParam: string;
|
||||||
}: {
|
btnLabel: UserCellBtnLabel;
|
||||||
agent: BskyServiceWorkerClient | BskyClient,
|
statusKey: keyof ViewerState;
|
||||||
userCellQueryParam: string,
|
// biome-ignore lint:
|
||||||
btnLabel: UserCellBtnLabel,
|
addQuery: (arg: string) => Promise<any>;
|
||||||
statusKey: keyof ViewerState,
|
// biome-ignore lint:
|
||||||
addQuery: (arg: string) => Promise<any>,
|
removeQuery: (arg: string) => Promise<any>;
|
||||||
removeQuery: (arg: string) => Promise<any>,
|
}) => {
|
||||||
}) => {
|
removeReloadEl();
|
||||||
|
|
||||||
removeReloadEl()
|
|
||||||
|
|
||||||
const userCells = getUserCells({
|
const userCells = getUserCells({
|
||||||
queryParam: userCellQueryParam,
|
queryParam: userCellQueryParam,
|
||||||
filterInsertedElement: true,
|
filterInsertedElement: true,
|
||||||
})
|
});
|
||||||
debugLog(`userCells length: ${userCells.length}`)
|
debugLog(`userCells length: ${userCells.length}`);
|
||||||
|
|
||||||
let index = 0
|
let index = 0;
|
||||||
|
|
||||||
// loop over twitter user profile cells and search and insert bsky user
|
// loop over twitter user profile cells and search and insert bsky user
|
||||||
for (const userCell of userCells) {
|
for (const userCell of userCells) {
|
||||||
if (isOutOfTopViewport(userCell)) {
|
if (isOutOfTopViewport(userCell)) {
|
||||||
continue
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { twAccountName, twDisplayName, twAccountNameRemoveUnderscore } = getAccountNameAndDisplayName(userCell)
|
const { twAccountName, twDisplayName, twAccountNameRemoveUnderscore } =
|
||||||
|
getAccountNameAndDisplayName(userCell);
|
||||||
|
|
||||||
if (notFoundUserCache.has(twAccountName)) {
|
if (notFoundUserCache.has(twAccountName)) {
|
||||||
insertNotFoundEl(userCell)
|
insertNotFoundEl(userCell);
|
||||||
continue
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const searchTerms = [
|
const searchTerms = [twAccountNameRemoveUnderscore, twDisplayName];
|
||||||
twAccountNameRemoveUnderscore,
|
|
||||||
twDisplayName,
|
|
||||||
]
|
|
||||||
|
|
||||||
let targetAccount = null
|
let targetAccount = null;
|
||||||
let matchType = null
|
let matchType = null;
|
||||||
|
|
||||||
// Loop over search parameters and break if a user is found
|
// Loop over search parameters and break if a user is found
|
||||||
searchLoop: for (const term of searchTerms) {
|
searchLoop: for (const term of searchTerms) {
|
||||||
// one symbol is not a valid search term for bsky
|
// one symbol is not a valid search term for bsky
|
||||||
if (!term || isOneSymbol(term)) {
|
if (!term || isOneSymbol(term)) {
|
||||||
continue
|
continue;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const searchResults = await agent.searchUser({
|
const searchResults = await agent.searchUser({
|
||||||
term: term,
|
term: term,
|
||||||
limit: 3,
|
limit: 3,
|
||||||
})
|
});
|
||||||
|
|
||||||
for (const searchResult of searchResults) {
|
for (const searchResult of searchResults) {
|
||||||
const { isSimilar: isUserFound, type } = isSimilarUser({
|
const { isSimilar: isUserFound, type } = isSimilarUser(
|
||||||
accountName: twAccountName,
|
{
|
||||||
accountNameRemoveUnderscore: twAccountNameRemoveUnderscore,
|
accountName: twAccountName,
|
||||||
displayName: twDisplayName,
|
accountNameRemoveUnderscore: twAccountNameRemoveUnderscore,
|
||||||
}, searchResult)
|
displayName: twDisplayName,
|
||||||
|
},
|
||||||
|
searchResult,
|
||||||
|
);
|
||||||
|
|
||||||
if (isUserFound) {
|
if (isUserFound) {
|
||||||
targetAccount = searchResult
|
targetAccount = searchResult;
|
||||||
matchType = type
|
matchType = type;
|
||||||
break searchLoop; // Stop searching when a user is found
|
break searchLoop; // Stop searching when a user is found
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e)
|
console.error(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,7 +106,7 @@ export const searchAndInsertBskyUsers = async (
|
|||||||
matchType,
|
matchType,
|
||||||
addAction: async () => {
|
addAction: async () => {
|
||||||
const result = await addQuery(targetAccount.did);
|
const result = await addQuery(targetAccount.did);
|
||||||
bskyUserUrlMap.set(targetAccount.did, result.uri)
|
bskyUserUrlMap.set(targetAccount.did, result.uri);
|
||||||
},
|
},
|
||||||
removeAction: async () => {
|
removeAction: async () => {
|
||||||
if (targetAccount?.viewer?.following) {
|
if (targetAccount?.viewer?.following) {
|
||||||
@ -109,16 +115,16 @@ export const searchAndInsertBskyUsers = async (
|
|||||||
await removeQuery(bskyUserUrlMap.get(targetAccount.did));
|
await removeQuery(bskyUserUrlMap.get(targetAccount.did));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
insertNotFoundEl(userCell)
|
insertNotFoundEl(userCell);
|
||||||
notFoundUserCache.add(twAccountName)
|
notFoundUserCache.add(twAccountName);
|
||||||
}
|
}
|
||||||
|
|
||||||
index++
|
index++;
|
||||||
|
|
||||||
if (process.env.NODE_ENV === "development" && index > 5) {
|
if (process.env.NODE_ENV === "development" && index > 5) {
|
||||||
break
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,6 +137,6 @@ export const searchAndInsertBskyUsers = async (
|
|||||||
statusKey,
|
statusKey,
|
||||||
addQuery,
|
addQuery,
|
||||||
removeQuery,
|
removeQuery,
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
export const debugLog = (message: string) => {
|
export const debugLog = (message: string) => {
|
||||||
if(process.env.NODE_ENV === "development") {
|
if (process.env.NODE_ENV === "development") {
|
||||||
console.log(`🔷 [Sky Follower Bridge] ${message}`)
|
console.log(`🔷 [Sky Follower Bridge] ${message}`);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export const isOneSymbol = (str: string) => {
|
export const isOneSymbol = (str: string) => {
|
||||||
return /^[^\w\s]$/.test(str);
|
return /^[^\w\s]$/.test(str);
|
||||||
}
|
};
|
||||||
|
|||||||
516
src/popup.tsx
516
src/popup.tsx
@ -1,252 +1,264 @@
|
|||||||
import { type FormEvent, useState, useEffect } from "react"
|
import { type FormEvent, useEffect, useState } from "react";
|
||||||
import { P, match } from "ts-pattern"
|
import { P, match } from "ts-pattern";
|
||||||
|
|
||||||
import "./style.css"
|
import "./style.css";
|
||||||
|
|
||||||
import { sendToContentScript } from "@plasmohq/messaging"
|
import { sendToContentScript } from "@plasmohq/messaging";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
MAX_RELOAD_COUNT,
|
MAX_RELOAD_COUNT,
|
||||||
MESSAGE_NAMES,
|
MESSAGE_NAMES,
|
||||||
MESSAGE_TYPE,
|
MESSAGE_TYPE,
|
||||||
STORAGE_KEYS,
|
STORAGE_KEYS,
|
||||||
TARGET_URLS_REGEX
|
TARGET_URLS_REGEX,
|
||||||
} from "~lib/constants"
|
} from "~lib/constants";
|
||||||
|
|
||||||
function IndexPopup() {
|
function IndexPopup() {
|
||||||
const [isLoading, setIsLoading] = useState(false)
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [password, setPassword] = useState("")
|
const [password, setPassword] = useState("");
|
||||||
const [userId, setUserId] = useState("")
|
const [userId, setUserId] = useState("");
|
||||||
const [reloadCount, setReloadCount] = useState(0)
|
const [reloadCount, setReloadCount] = useState(0);
|
||||||
const [message, setMessage] = useState<null | {
|
const [message, setMessage] = useState<null | {
|
||||||
type: (typeof MESSAGE_TYPE)[keyof typeof MESSAGE_TYPE]
|
type: (typeof MESSAGE_TYPE)[keyof typeof MESSAGE_TYPE];
|
||||||
message: string
|
message: string;
|
||||||
}>(null)
|
}>(null);
|
||||||
const isDisabled = !password || !userId || isLoading
|
const isDisabled = !password || !userId || isLoading;
|
||||||
const isShowErrorMessage = message?.type === MESSAGE_TYPE.ERROR
|
const isShowErrorMessage = message?.type === MESSAGE_TYPE.ERROR;
|
||||||
const isShowSuccessMessage = message?.type === MESSAGE_TYPE.SUCCESS
|
const isShowSuccessMessage = message?.type === MESSAGE_TYPE.SUCCESS;
|
||||||
|
|
||||||
const setErrorMessage = (message: string) => {
|
const setErrorMessage = (message: string) => {
|
||||||
setMessage({ type: MESSAGE_TYPE.ERROR, message })
|
setMessage({ type: MESSAGE_TYPE.ERROR, message });
|
||||||
}
|
};
|
||||||
|
|
||||||
const reloadActiveTab = async () => {
|
const reloadActiveTab = async () => {
|
||||||
const [{ id: tabId }] = await chrome.tabs.query({
|
const [{ id: tabId }] = await chrome.tabs.query({
|
||||||
active: true,
|
active: true,
|
||||||
currentWindow: true
|
currentWindow: true,
|
||||||
})
|
});
|
||||||
await chrome.tabs.reload(tabId)
|
await chrome.tabs.reload(tabId);
|
||||||
}
|
};
|
||||||
|
|
||||||
const saveCredentialsToStorage = () => {
|
const saveCredentialsToStorage = () => {
|
||||||
chrome.storage.local.set({
|
chrome.storage.local.set({
|
||||||
[STORAGE_KEYS.BSKY_PASSWORD]: password,
|
[STORAGE_KEYS.BSKY_PASSWORD]: password,
|
||||||
[STORAGE_KEYS.BSKY_USER_ID]: userId
|
[STORAGE_KEYS.BSKY_USER_ID]: userId,
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
const loadCredentialsFromStorage = async () => {
|
const loadCredentialsFromStorage = async () => {
|
||||||
chrome.storage.local.get(
|
chrome.storage.local.get(
|
||||||
[STORAGE_KEYS.BSKY_PASSWORD, STORAGE_KEYS.BSKY_USER_ID],
|
[STORAGE_KEYS.BSKY_PASSWORD, STORAGE_KEYS.BSKY_USER_ID],
|
||||||
(result) => {
|
(result) => {
|
||||||
setPassword(result[STORAGE_KEYS.BSKY_PASSWORD] || "")
|
setPassword(result[STORAGE_KEYS.BSKY_PASSWORD] || "");
|
||||||
setUserId(result[STORAGE_KEYS.BSKY_USER_ID] || "")
|
setUserId(result[STORAGE_KEYS.BSKY_USER_ID] || "");
|
||||||
}
|
},
|
||||||
)
|
);
|
||||||
}
|
};
|
||||||
|
|
||||||
const searchBskyUser = async (e?: FormEvent) => {
|
const searchBskyUser = async (e?: FormEvent) => {
|
||||||
if(e) {
|
if (e) {
|
||||||
e.preventDefault()
|
e.preventDefault();
|
||||||
}
|
}
|
||||||
saveCredentialsToStorage()
|
saveCredentialsToStorage();
|
||||||
|
|
||||||
const [{ url: currentUrl }] = await chrome.tabs.query({
|
const [{ url: currentUrl }] = await chrome.tabs.query({
|
||||||
active: true,
|
active: true,
|
||||||
currentWindow: true
|
currentWindow: true,
|
||||||
})
|
});
|
||||||
|
|
||||||
if (!Object.values(TARGET_URLS_REGEX).some((r) => r.test(currentUrl))) {
|
if (!Object.values(TARGET_URLS_REGEX).some((r) => r.test(currentUrl))) {
|
||||||
setErrorMessage(
|
setErrorMessage(
|
||||||
"Error: Invalid page. please open the Twitter following or blocking page."
|
"Error: Invalid page. please open the Twitter following or blocking page.",
|
||||||
)
|
);
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const messageName = match(currentUrl)
|
const messageName = match(currentUrl)
|
||||||
.with(
|
.with(
|
||||||
P.when((url) => TARGET_URLS_REGEX.FOLLOW.test(url)),
|
P.when((url) => TARGET_URLS_REGEX.FOLLOW.test(url)),
|
||||||
() => MESSAGE_NAMES.SEARCH_BSKY_USER_ON_FOLLOW_PAGE
|
() => MESSAGE_NAMES.SEARCH_BSKY_USER_ON_FOLLOW_PAGE,
|
||||||
)
|
)
|
||||||
.with(
|
.with(
|
||||||
P.when((url) => TARGET_URLS_REGEX.BLOCK.test(url)),
|
P.when((url) => TARGET_URLS_REGEX.BLOCK.test(url)),
|
||||||
() => MESSAGE_NAMES.SEARCH_BSKY_USER_ON_BLOCK_PAGE
|
() => MESSAGE_NAMES.SEARCH_BSKY_USER_ON_BLOCK_PAGE,
|
||||||
)
|
)
|
||||||
.with(
|
.with(
|
||||||
P.when((url) => TARGET_URLS_REGEX.LIST.test(url)),
|
P.when((url) => TARGET_URLS_REGEX.LIST.test(url)),
|
||||||
() => MESSAGE_NAMES.SEARCH_BSKY_USER_ON_LIST_MEMBERS_PAGE
|
() => MESSAGE_NAMES.SEARCH_BSKY_USER_ON_LIST_MEMBERS_PAGE,
|
||||||
)
|
)
|
||||||
.run()
|
.run();
|
||||||
|
|
||||||
setMessage(null)
|
setMessage(null);
|
||||||
setIsLoading(true)
|
setIsLoading(true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res: { hasError: boolean; message: string } =
|
const res: { hasError: boolean; message: string } =
|
||||||
await sendToContentScript({
|
await sendToContentScript({
|
||||||
name: messageName,
|
name: messageName,
|
||||||
body: {
|
body: {
|
||||||
password,
|
password,
|
||||||
userId
|
userId,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
if (res.hasError) {
|
if (res.hasError) {
|
||||||
setErrorMessage(res.message)
|
setErrorMessage(res.message);
|
||||||
} else {
|
} else {
|
||||||
setMessage({
|
setMessage({
|
||||||
type: MESSAGE_TYPE.SUCCESS,
|
type: MESSAGE_TYPE.SUCCESS,
|
||||||
message: "Completed. Try again if no results found.”"
|
message: "Completed. Try again if no results found.”",
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if(e.message && e.message.includes("Could not establish connection") && reloadCount < MAX_RELOAD_COUNT) {
|
if (
|
||||||
setReloadCount((prev) => prev + 1)
|
e.message?.includes("Could not establish connection") &&
|
||||||
await reloadActiveTab()
|
reloadCount < MAX_RELOAD_COUNT
|
||||||
await new Promise(r => setTimeout(r, 3000))
|
) {
|
||||||
await searchBskyUser()
|
setReloadCount((prev) => prev + 1);
|
||||||
} else {
|
await reloadActiveTab();
|
||||||
setErrorMessage(
|
await new Promise((r) => setTimeout(r, 3000));
|
||||||
"Error: Something went wrong. Please reload the web page and try again."
|
await searchBskyUser();
|
||||||
)
|
} else {
|
||||||
console.error(e)
|
setErrorMessage(
|
||||||
}
|
"Error: Something went wrong. Please reload the web page and try again.",
|
||||||
} finally {
|
);
|
||||||
setIsLoading(false)
|
console.error(e);
|
||||||
}
|
}
|
||||||
}
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
useEffect(() => {
|
}
|
||||||
loadCredentialsFromStorage()
|
};
|
||||||
}, [])
|
|
||||||
|
useEffect(() => {
|
||||||
return (
|
loadCredentialsFromStorage();
|
||||||
<div className="px-5 pt-3 pb-4 w-[380px]">
|
}, [loadCredentialsFromStorage]);
|
||||||
<h1 className="text-primary text-2xl font-thin flex gap-2 items-center">
|
|
||||||
<svg
|
return (
|
||||||
className="w-5 h-5"
|
<div className="px-5 pt-3 pb-4 w-[380px]">
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
<h1 className="text-primary text-2xl font-thin flex gap-2 items-center">
|
||||||
width="48"
|
<svg
|
||||||
height="48"
|
className="w-5 h-5"
|
||||||
viewBox="0 0 48 48">
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
<g
|
width="48"
|
||||||
fill="none"
|
height="48"
|
||||||
stroke="currentColor"
|
viewBox="0 0 48 48"
|
||||||
strokeLinejoin="round"
|
>
|
||||||
strokeWidth="4">
|
<g
|
||||||
<path
|
fill="none"
|
||||||
strokeLinecap="round"
|
stroke="currentColor"
|
||||||
d="M36 8H13c-3 0-9 2-9 8s6 8 9 8h22c3 0 9 2 9 8s-6 8-9 8H12"
|
strokeLinejoin="round"
|
||||||
/>
|
strokeWidth="4"
|
||||||
<path d="M40 12a4 4 0 1 0 0-8a4 4 0 0 0 0 8ZM8 44a4 4 0 1 0 0-8a4 4 0 0 0 0 8Z" />
|
>
|
||||||
</g>
|
<path
|
||||||
</svg>
|
strokeLinecap="round"
|
||||||
Sky Follower Bridge
|
d="M36 8H13c-3 0-9 2-9 8s6 8 9 8h22c3 0 9 2 9 8s-6 8-9 8H12"
|
||||||
</h1>
|
/>
|
||||||
<form onSubmit={searchBskyUser} className="mt-2">
|
<path d="M40 12a4 4 0 1 0 0-8a4 4 0 0 0 0 8ZM8 44a4 4 0 1 0 0-8a4 4 0 0 0 0 8Z" />
|
||||||
<label className="join w-full" htmlFor="userId">
|
</g>
|
||||||
<span className="join-item btn btn-sm btn-active cursor-default">
|
</svg>
|
||||||
<svg
|
Sky Follower Bridge
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
</h1>
|
||||||
fill="none"
|
<form onSubmit={searchBskyUser} className="mt-2">
|
||||||
viewBox="0 0 24 24"
|
<label className="join w-full" htmlFor="userId">
|
||||||
strokeWidth={1.5}
|
<span className="join-item btn btn-sm btn-active cursor-default">
|
||||||
stroke="currentColor"
|
<svg
|
||||||
className="w-4 h-4">
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
<path
|
fill="none"
|
||||||
strokeLinecap="round"
|
viewBox="0 0 24 24"
|
||||||
strokeLinejoin="round"
|
strokeWidth={1.5}
|
||||||
d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z"
|
stroke="currentColor"
|
||||||
/>
|
className="w-4 h-4"
|
||||||
</svg>
|
>
|
||||||
</span>
|
<path
|
||||||
<input
|
strokeLinecap="round"
|
||||||
type="text"
|
strokeLinejoin="round"
|
||||||
name="userId"
|
d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z"
|
||||||
placeholder="@you.bsky.social"
|
/>
|
||||||
value={userId}
|
</svg>
|
||||||
onChange={(e) => setUserId(e.target.value)}
|
</span>
|
||||||
className="input input-bordered input-sm w-full max-w-xs join-item focus:outline-none"
|
<input
|
||||||
/>
|
type="text"
|
||||||
</label>
|
name="userId"
|
||||||
<label className="join mt-2 w-full" htmlFor="password">
|
placeholder="@you.bsky.social"
|
||||||
<span className="join-item btn btn-sm btn-active cursor-default">
|
value={userId}
|
||||||
<svg
|
onChange={(e) => setUserId(e.target.value)}
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
className="input input-bordered input-sm w-full max-w-xs join-item focus:outline-none"
|
||||||
fill="none"
|
/>
|
||||||
viewBox="0 0 24 24"
|
</label>
|
||||||
strokeWidth={1.5}
|
<label className="join mt-2 w-full" htmlFor="password">
|
||||||
stroke="currentColor"
|
<span className="join-item btn btn-sm btn-active cursor-default">
|
||||||
className="w-4 h-4">
|
<svg
|
||||||
<path
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
strokeLinecap="round"
|
fill="none"
|
||||||
strokeLinejoin="round"
|
viewBox="0 0 24 24"
|
||||||
d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z"
|
strokeWidth={1.5}
|
||||||
/>
|
stroke="currentColor"
|
||||||
</svg>
|
className="w-4 h-4"
|
||||||
</span>
|
>
|
||||||
<input
|
<path
|
||||||
type="password"
|
strokeLinecap="round"
|
||||||
name="password"
|
strokeLinejoin="round"
|
||||||
placeholder="your app password"
|
d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z"
|
||||||
value={password}
|
/>
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
</svg>
|
||||||
className="input input-bordered input-sm w-full max-w-xs join-item focus:outline-none"
|
</span>
|
||||||
/>
|
<input
|
||||||
</label>
|
type="password"
|
||||||
<button
|
name="password"
|
||||||
type="submit"
|
placeholder="your app password"
|
||||||
className={`disabled:text-gray-600 mt-3 normal-case btn btn-primary btn-sm w-full`}
|
value={password}
|
||||||
disabled={isDisabled}>
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
{ isLoading && <span className="w-4 loading loading-spinner"></span> }
|
className="input input-bordered input-sm w-full max-w-xs join-item focus:outline-none"
|
||||||
{ isLoading ? "Finding Bluesky Users" : "Find Bluesky Users" }
|
/>
|
||||||
</button>
|
</label>
|
||||||
{isShowErrorMessage && (
|
<button
|
||||||
<div className="flex gap-2 items-center text-red-600 border border-red-600 p-2 rounded-md mt-2">
|
type="submit"
|
||||||
<svg
|
className={
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
"disabled:text-gray-600 mt-3 normal-case btn btn-primary btn-sm w-full"
|
||||||
className="stroke-current flex-shrink-0 h-6 w-6"
|
}
|
||||||
fill="none"
|
disabled={isDisabled}
|
||||||
viewBox="0 0 24 24">
|
>
|
||||||
<path
|
{isLoading && <span className="w-4 loading loading-spinner" />}
|
||||||
strokeLinecap="round"
|
{isLoading ? "Finding Bluesky Users" : "Find Bluesky Users"}
|
||||||
stroke-linejoin="round"
|
</button>
|
||||||
strokeWidth="2"
|
{isShowErrorMessage && (
|
||||||
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
|
<div className="flex gap-2 items-center text-red-600 border border-red-600 p-2 rounded-md mt-2">
|
||||||
/>
|
<svg
|
||||||
</svg>
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
<span>{message.message}</span>
|
className="stroke-current flex-shrink-0 h-6 w-6"
|
||||||
</div>
|
fill="none"
|
||||||
)}
|
viewBox="0 0 24 24"
|
||||||
{isShowSuccessMessage && (
|
>
|
||||||
<div className="flex gap-2 items-center text-green-600 border border-green-600 p-1 rounded-md mt-2">
|
<path
|
||||||
<svg
|
strokeLinecap="round"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
stroke-linejoin="round"
|
||||||
className="stroke-current flex-shrink-0 h-6 w-6"
|
strokeWidth="2"
|
||||||
fill="none"
|
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
|
||||||
viewBox="0 0 24 24">
|
/>
|
||||||
<path
|
</svg>
|
||||||
strokeLinecap="round"
|
<span>{message.message}</span>
|
||||||
strokeLinejoin="round"
|
</div>
|
||||||
strokeWidth="2"
|
)}
|
||||||
d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
|
{isShowSuccessMessage && (
|
||||||
/>
|
<div className="flex gap-2 items-center text-green-600 border border-green-600 p-1 rounded-md mt-2">
|
||||||
</svg>
|
<svg
|
||||||
<span>Success. Try again if no results found.</span>
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
</div>
|
className="stroke-current flex-shrink-0 h-6 w-6"
|
||||||
)}
|
fill="none"
|
||||||
</form>
|
viewBox="0 0 24 24"
|
||||||
</div>
|
>
|
||||||
)
|
<path
|
||||||
}
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
export default IndexPopup
|
strokeWidth="2"
|
||||||
|
d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<span>Success. Try again if no results found.</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default IndexPopup;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user