Compare commits

...

58 Commits

Author SHA1 Message Date
Nes 633bf05dad Add updates.json 2026-10-30 15:05:16 -07:00
Nes370 37b359597c Update icon-128.png
Replaced default icon with Nol <3
2026-10-12 20:32:09 -07:00
neobooru c17bd87089 Update neo-scraper to 0.11.1 2026-08-19 00:41:28 +02:00
neobooru 59145cebdc Lock primevue to version 3.45.0
Needed because we override some of their styles. These overrides slightly changed in newer versions.
2026-08-19 00:13:40 +02:00
neobooru 4895e126fb Update dependencies + small fix 2026-08-19 00:07:46 +02:00
neobooru a0a0a591bc Run prettier 2026-08-18 23:25:03 +02:00
neobooru 381dac72d4 Update 'Tags to ignore' interface 2026-08-18 23:24:43 +02:00
G1org1owo 646241b45f PopupMain.vue: filter tags for each post based on tag ignores 2026-08-18 23:22:06 +02:00
G1org1owo 45f20ebfc8 Add config interface for tag ignores 2026-08-18 23:22:06 +02:00
G1org1owo 3d243252cd Add ability to select multiple tabs 2026-08-18 22:33:57 +02:00
neobooru 0f83292e86 Disable upload notifications by default 2026-08-18 22:23:49 +02:00
Keo Cheung be2afe55ff Add option to send browser notifications 2026-08-18 22:22:02 +02:00
Keo Cheung 5101c79c59 Send notifications after uploading 2026-08-18 22:22:02 +02:00
neobooru e2bf28a29b Update neo-scraper to 0.11.0 2026-07-31 02:18:44 +02:00
G1org1owo 1a6fe13512 Fix undefined tag usages access in PopupMain.vue 2025-08-27 22:15:36 +02:00
neobooru ce6a6c6521 Update neo-scraper to 0.10.1 2025-04-12 01:05:04 +02:00
neobooru 3aa31955ce Use ubuntu 24.04 for builds and fix artifact naming issue 2025-02-19 00:11:51 +01:00
neobooru 24cec0bd81 Update web-ext to v8 2025-02-19 00:06:51 +01:00
neobooru f4a1b2a1ea Update to neo-scraper v0.10.0
And try to rename build artifacts
2025-02-19 00:01:16 +01:00
neobooru e9d37caf7c Update actions/upload-artifact version 2025-02-17 00:30:49 +01:00
neobooru afe4ff535b Fix issue where merging new image content for existing posts did not work when uploadMode is set to "content" 2025-02-17 00:24:09 +01:00
shibao 9e07ee1594 add alwaysUploadAsContent option 2025-01-21 23:43:28 +01:00
neobooru 7c5c4d3ccd Fix pnpm-lock.yaml 2024-12-09 00:30:54 +01:00
neobooru 4bea802819 Update neo-scraper to 0.9.3 2024-12-08 18:58:45 +01:00
neobooru c08e6473e9 Update neo-scraper to fix yande.re issues 2024-07-11 23:10:09 +02:00
neobooru 76a4c01577 Fix linter warning 2024-07-10 20:34:00 +02:00
G1org1owo cae923b68a Refactor nesting in loadTagCounts() 2024-07-09 01:31:35 +02:00
G1org1owo 5ff664e725 Check for aliases when loading tag counts 2024-07-09 01:21:12 +02:00
neobooru eae1b3949f Update neo-scraper to 0.9.0 + post.uploadMode changes 2024-06-25 23:46:05 +02:00
neobooru 9843f0b641 Improved workaround for sites with hotlink protection or which require authentication 2024-06-14 16:59:57 +02:00
neobooru 3d9586147b Update danbooru tag category scraper 2024-01-09 23:28:12 +01:00
neobooru 4f16088a3b Fix typo 2024-01-04 20:36:11 +01:00
neobooru 390d865e5a Update lockfile 2024-01-01 23:41:58 +01:00
neobooru 1fa42c94a6 Workaround for new danbooru bot protection 2024-01-01 20:24:01 +01:00
neobooru b4e63c8c5e Update dependencies to latest major + css fix 2023-12-29 19:13:18 +01:00
neobooru 828e8c5a16 Allow hiding of select UI elements 2023-12-29 16:33:06 +01:00
neobooru dfd9c87858 Add strict_min_version for gecko and gecko_android 2023-12-29 15:40:35 +01:00
neobooru ee003912d5 Update dependencies and run prettier 2023-12-29 15:17:42 +01:00
neobooru c74926b8c1 Add pool feature in post upload view 2023-12-05 21:25:11 +01:00
neobooru b7f1ce3a21 Also run build action when package.json or lockfile changes 2023-12-01 23:24:35 +01:00
neobooru e745252038 Use neo-scraper 0.7.3 2023-12-01 23:22:07 +01:00
neobooru adc25d46d3 Add button which imports tag categories from the selected configured szurubooru instance 2023-10-28 00:33:17 +02:00
neobooru 335bc6ee2c Add debug functions to the options page and fix linter warnings 2023-10-04 00:27:07 +02:00
neobooru ab6b0186ee Add config migration code
This should ensure that each user has the default tag categories when updating from an older version.
2023-10-04 00:12:05 +02:00
neobooru 7a296c1729 Update workflow 2023-09-08 19:07:55 +02:00
neobooru 237fe88f1c Fix linter error 2023-09-03 14:42:05 +02:00
neobooru 63d88dc7e5 Add feature to manually add tag category colors 2023-09-03 14:26:45 +02:00
neobooru f66591db6d Refactor some frontend components and add feature to disable automatic tag import 2023-09-03 14:26:45 +02:00
neobooru a9acd53f89 Only publish listed on AMO when tagging or manually dispatching
Not sure if this works, only the future will tell.
2023-08-21 14:30:56 +02:00
neobooru 448413c9f7 Add link to the extension on the firefox addon store 2023-08-21 14:11:13 +02:00
neobooru 7051c3e9a5 Add option to manually run a workflow 2023-08-14 20:47:17 +02:00
neobooru 56395d4944 Try automatically publishing to the firefox add-ons store once more 2023-08-14 20:42:09 +02:00
neobooru 59fd8be0d3 Add some screenshots 2023-08-02 19:57:31 +02:00
neobooru 742a6da3c0 Only run github actions when extension source changed 2023-08-02 19:57:25 +02:00
neobooru 6b93a9ced8 Try to automatically upload extension to the official firefox addon store 2023-08-02 19:41:21 +02:00
neobooru bbd361ae4d Firefox build fix 2023-07-15 23:07:06 +02:00
neobooru f29b120f7b Remove browser_specific_settings from Chrome build + GitHub actions fixes 2023-07-15 22:48:00 +02:00
Neo c1f0ce6eae
Add GitHub actions to automatically build Chrome and Firefox extensions (#44) 2023-07-15 16:08:37 +02:00
47 changed files with 7204 additions and 5824 deletions

View File

@ -23,5 +23,7 @@ module.exports = {
}, },
], ],
"@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-explicit-any": "off",
"eol-last": ["error", "always"],
"comma-dangle": ["error", "always-multiline"],
}, },
}; };

View File

@ -0,0 +1,44 @@
name: "Setup project"
runs:
using: "composite"
steps:
- uses: actions/setup-dotnet@v3
with:
dotnet-version: "7.0.x"
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0
with:
versionSpec: "5.x"
- name: Determine Version
uses: gittools/actions/gitversion/execute@v0
id: version
with:
useConfigFile: true
- name: Use the version
shell: bash
run: |
echo VITE_SZ_VERSION="${{ steps.version.outputs.AssemblySemFileVer }}" >> $GITHUB_ENV
echo VITE_SZ_VERSION_INFO="${{ steps.version.outputs.InformationalVersion }}" >> $GITHUB_ENV
- uses: pnpm/action-setup@v2
name: Install pnpm
id: pnpm-install
with:
version: 9
run_install: false
- uses: actions/setup-node@v3
with:
node-version: "20"
cache: "pnpm"
- name: Install dependencies
shell: bash
run: pnpm install
- name: Linter
shell: bash
run: pnpm lint

95
.github/workflows/build.yaml vendored Normal file
View File

@ -0,0 +1,95 @@
name: Build release
on:
push:
paths:
- src/**
- extension/**
- package.json
- pnpm-lock.yaml
workflow_dispatch:
inputs:
publish_amo_listed:
description: "Publish to AMO"
required: false
type: boolean
jobs:
build_chrome:
name: "Build Chrome Extension"
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup-for-build
- name: Build
run: pnpm build
- name: Pack ZIP
run: pnpm pack:zip
- uses: actions/upload-artifact@v4
with:
name: Chrome Extension (Unsigned)
path: extension.zip
build_unlisted_firefox:
name: "Build Unlisted Firefox Extension"
runs-on: ubuntu-24.04
# Doesn't really need the Chrome build, but we can reuse its cache.
needs: build_chrome
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup-for-build
- name: Build
run: pnpm build
env:
SZ_GECKO_ID: 13372607-2257-4360-8f51-5ce66fa73350
- name: Sign XPI
run: pnpm sign:firefox --channel unlisted
env:
WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
- name: Rename XPI
run: rename.ul szuruchrome_gh- SzuruChrome-v web-ext-artifacts/*.xpi
- uses: actions/upload-artifact@v4
with:
name: Firefox Extension (Signed)
path: web-ext-artifacts/*.xpi
build_amo_firefox:
name: "Build Firefox Extension for AMO"
runs-on: ubuntu-24.04
# Doesn't really need the Chrome build, but we can reuse its cache.
needs: build_chrome
# Only run (on master branch && if tagged) or (manually dispatching).
if: startsWith(github.ref, 'refs/tags/v') || github.event.inputs.publish_amo_listed == true
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup-for-build
- name: Build
run: pnpm build
env:
SZ_GECKO_ID: 18365332-8485-4c04-9498-2843a41ab620
- name: Sign XPI and upload to AMO
run: pnpm sign:firefox --channel listed
env:
WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ extension/manifest.json
node_modules node_modules
src/auto-imports.d.ts src/auto-imports.d.ts
src/components.d.ts src/components.d.ts
*artifacts/

View File

@ -1,4 +1,4 @@
{ {
"printWidth": 120, "printWidth": 120,
"tabWidth": 2 "tabWidth": 2
} }

View File

@ -1,6 +1,3 @@
{ {
"recommendations": [ "recommendations": ["vue.volar", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
"vue.volar",
"dbaeumer.vscode-eslint",
]
} }

View File

@ -1,6 +1,6 @@
{ {
"typescript.tsdk": "node_modules/typescript/lib", "typescript.tsdk": "node_modules/typescript/lib",
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll.eslint": true "source.fixAll.eslint": "explicit"
}, }
} }

7
GitVersion.yml Normal file
View File

@ -0,0 +1,7 @@
mode: ContinuousDelivery
increment: None
assembly-file-versioning-format: "{Major}.{Minor}.{Patch}.{CommitsSinceVersionSource}"
branches: {}
ignore:
sha: []
merge-message-formats: {}

View File

@ -2,39 +2,22 @@
Chrome/Firefox extension which can import media from various sites into a [szurubooru](https://github.com/rr-/szurubooru) instance. Chrome/Firefox extension which can import media from various sites into a [szurubooru](https://github.com/rr-/szurubooru) instance.
## Supported sites ![Screenshot](./docs/screenshots/Default%20-%20Existing%20post%20found.png)
| Engine | Sites | Features | Notes |
| -------------- | ------------------------------------------------------------- | -------------------------------------------------------------- | ------------------------------------------------------------------------------- |
| animepictures | anime-pictures.net | content, resolution, tags, tag_category | Rating is assumed to be safe. |
| danbooru | danbooru.donmai.us, safebooru.donmai.us | content, rating, resolution, tags, tag_category, source, notes | |
| e621 | e621.net, e926.net | content, rating, resolution, tags, tag_category, source | |
| furaffinity | www.furaffinity.net | content, rating, resolution, tags, tag_category | |
| gelbooru | safebooru.org, gelbooru.com, rule34.xxx, tbib.org, xbooru.com | content, rating, resolution, tags, tag_category, source, notes | Supported features might vary between hosts. |
| inkbunny | inkbunny.net | content, rating, resolution, tags | |
| moebooru | yande.re, konachan.com | content, rating, resolution, tags, tag_category, source, notes | |
| pixiv | pixiv.net, www.pixiv.net | content | |
| reddit | reddit.com, new.reddit.com, old.reddit.com | content | |
| rule34us | rule34.us | content, resolution, tags, tag_category | Rating is assumed to be unsafe. |
| sankakucomplex | chan.sankakucomplex.com | content, rating, tags, tag_category, notes | Hotlink protection currently prevents szurubooru from importing from this site. |
| shimmie2 | rule34.paheal.net, rule34hentai.net | content, tags, source | Rating is assumed to be unsafe. |
| shuushuu | e-shuushuu.net | content, rating, resolution, tags, tag_category | Rating is assumed to be safe. |
| twitter | twitter.com, mobile.twitter.com | content | |
| zerochan | www.zerochan.net | content, resolution, tags, tag_category | Rating is assumed to be safe. |
| fallback | | content | Tries to find the largest image or video on the current page. |
## Installation ## Installation
For development see [build/debug](#Builddebug).
### Firefox ### Firefox
Just download the .xpi from [release tab](https://github.com/neobooru/SzuruChrome/releases) and install it. I am experimenting with publishing the extension to Firefox Add-ons. You can find it [here](https://addons.mozilla.org/en-US/firefox/addon/szuruchrome/). This version will automatically update.
You can also download the .xpi from the [release tab](https://github.com/neobooru/SzuruChrome/releases) and manually install it. This version will not automatically update.
Both versions can be installed side by side, as they do not affect each other. This also means that you need to configure both of them independently.
### Chrome ### Chrome
I can't create a valid .crx file, which means that you'll have to use [Chrome's "Load unpacked extension"](https://developer.chrome.com/docs/extensions/mv3/getstarted/#unpacked) feature. I can't create a valid .crx file, which means that you'll have to use [Chrome's "Load unpacked extension"](https://developer.chrome.com/docs/extensions/mv3/getstarted/#unpacked) feature.
You can download a .zip containing the needed files from the [release tab](https://github.com/neobooru/SzuruChrome/releases). Check [this stackoverflow answer](https://stackoverflow.com/a/38011386) if you want to get rid of the developer extension popup. You can download a .zip containing the needed files from the [release tab](https://github.com/neobooru/SzuruChrome/releases). Check [this Stack Overflow answer](https://stackoverflow.com/a/38011386) if you want to get rid of the developer extension popup.
## Build/debug ## Build/debug
@ -53,13 +36,4 @@ After this you can load them in your browser.
Chrome: `chrome://extensions/` → "Load unpacked" → Select `./dist` folder Chrome: `chrome://extensions/` → "Load unpacked" → Select `./dist` folder
Firefox: `about:debugging` → "Load Temporary Add-on..." → Select any file in the `./dist` folder (it will load all files) Firefox: `about:debugging` → "Load Temporary Add-on..." → Select any file in the `./dist` folder (it will load all files)
See [the developer docs](./docs/DEVELOPER.md) for more information. See [the developer notes](https://github.com/neobooru/SzuruChrome/wiki/Developer-notes) for more information.
## Planned features
These are some things I might work on. Though honestly I don't expect this extension to change much anytime soon.
- Finishing the initial version of this add-on (see visual design doc for all features)
- Right click any image on a page to import it
- Configurable list of tags to always ignore (e.g. tagme, highres)
- [low priority] Import artist commentary

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -4,7 +4,6 @@
"description": "Import media from various sites into szurubooru.", "description": "Import media from various sites into szurubooru.",
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"packageManager": "pnpm@7.8.0",
"scripts": { "scripts": {
"dev": "npm run clear && cross-env NODE_ENV=development run-p dev:*", "dev": "npm run clear && cross-env NODE_ENV=development run-p dev:*",
"dev:prepare": "esno scripts/prepare.ts", "dev:prepare": "esno scripts/prepare.ts",
@ -20,59 +19,63 @@
"pack:xpi": "cross-env WEB_EXT_ARTIFACTS_DIR=./ web-ext build --source-dir ./extension --filename extension.xpi --overwrite-dest", "pack:xpi": "cross-env WEB_EXT_ARTIFACTS_DIR=./ web-ext build --source-dir ./extension --filename extension.xpi --overwrite-dest",
"start:chromium": "web-ext run --source-dir ./extension --target=chromium", "start:chromium": "web-ext run --source-dir ./extension --target=chromium",
"start:firefox": "web-ext run --source-dir ./extension --target=firefox-desktop", "start:firefox": "web-ext run --source-dir ./extension --target=firefox-desktop",
"sign:firefox": "web-ext sign --use-submission-api --source-dir ./extension --channel unlisted", "sign:firefox": "web-ext sign --source-dir ./extension",
"clear": "rimraf extension/dist extension/manifest.json extension.*", "clear": "rimraf extension/dist extension/manifest.json extension.*",
"lint": "eslint .", "lint": "eslint .",
"test": "vitest test" "extlint": "web-ext lint -s extension",
"test": "vitest test",
"pretty": "prettier -w ."
}, },
"dependencies": { "dependencies": {
"axios": "^1.2.2", "axios": "^1.19.0",
"basscss": "^8.1.0", "byte-size": "^8.2.1",
"byte-size": "^8.1.1",
"deepmerge": "^4.3.1", "deepmerge": "^4.3.1",
"lodash": "^4.17.21", "lodash": "^4.18.1",
"markdown-it": "^13.0.1", "markdown-it": "^14.3.0",
"neo-scraper": "^0.7.1", "neo-scraper": "^0.11.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"pinia": "^2.0.36", "pinia": "^2.3.1",
"vue-router": "4" "primeflex": "^3.3.1",
"primevue": "3.45.0",
"vue-router": "^4.6.4"
}, },
"devDependencies": { "devDependencies": {
"@ffflorian/jszip-cli": "^3.1.6", "@ffflorian/jszip-cli": "^3.16.5",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/vue-fontawesome": "^3.0.3", "@fortawesome/vue-fontawesome": "^3.3.3",
"@types/byte-size": "^8.1.0", "@types/byte-size": "^8.1.2",
"@types/fs-extra": "^9.0.13", "@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.14.194", "@types/lodash": "^4.17.25",
"@types/markdown-it": "^12.2.3", "@types/markdown-it": "^13.0.9",
"@types/node": "^18.11.9", "@types/node": "^20.19.43",
"@types/webextension-polyfill": "^0.9.1", "@types/webextension-polyfill": "^0.10.7",
"@typescript-eslint/eslint-plugin": "^5.44.0", "@typescript-eslint/eslint-plugin": "^6.21.0",
"@vitejs/plugin-vue": "^3.2.0", "@vitejs/plugin-vue": "^5.2.4",
"@vue/compiler-sfc": "^3.2.45", "@vue/compiler-sfc": "^3.5.41",
"@vue/test-utils": "^2.2.4", "@vue/test-utils": "^2.4.11",
"@vueuse/core": "^9.6.0", "@vueuse/core": "^10.11.1",
"chokidar": "^3.5.3", "chokidar": "^3.6.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"crx": "^5.0.1", "crx": "^5.0.1",
"eslint": "^8.32.0", "eslint": "^8.57.1",
"eslint-plugin-vue": "^9.9.0", "eslint-plugin-vue": "^9.33.0",
"esno": "^0.16.3", "esno": "^4.8.0",
"fs-extra": "^10.1.0", "fs-extra": "^11.4.0",
"jsdom": "^20.0.3", "jsdom": "^23.2.0",
"kolorist": "^1.6.0", "kolorist": "^1.8.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prettier": "^3.9.6",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"sass": "^1.57.1", "sass": "^1.102.0",
"typescript": "^4.9.3", "typescript": "^5.9.3",
"unplugin-auto-import": "^0.12.2", "unplugin-auto-import": "^0.17.8",
"unplugin-vue-components": "^0.23.0", "unplugin-vue-components": "^0.26.0",
"vite": "^3.2.4", "vite": "^5.4.21",
"vitest": "^0.25.3", "vitest": "^1.6.1",
"vue": "^3.2.45", "vue": "^3.5.41",
"vue-eslint-parser": "^9.1.0", "vue-eslint-parser": "^9.4.3",
"web-ext": "^7.5.0", "web-ext": "^8.10.0",
"webextension-polyfill": "^0.10.0" "webextension-polyfill": "^0.10.0"
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,9 @@
import { resolve } from 'path'; import { resolve } from "path";
import { bgCyan, black } from 'kolorist'; import { bgCyan, black } from "kolorist";
export const port = parseInt(process.env.PORT || '') || 3303; export const port = parseInt(process.env.PORT || "") || 3303;
export const r = (...args: string[]) => resolve(__dirname, '..', ...args); export const r = (...args: string[]) => resolve(__dirname, "..", ...args);
export const isDev = process.env.NODE_ENV !== 'production'; export const isDev = process.env.NODE_ENV !== "production";
export function log(name: string, message: string) { export function log(name: string, message: string) {
console.log(black(bgCyan(` ${name} `)), message); console.log(black(bgCyan(` ${name} `)), message);

View File

@ -10,9 +10,13 @@ import {
TagFields, TagFields,
TemporaryFileUploadResult, TemporaryFileUploadResult,
UpdatePostRequest, UpdatePostRequest,
PoolsResult,
PoolFields,
Pool,
UpdatePoolRequest,
} from "./models"; } from "./models";
import { ScrapedPostDetails } from "~/models"; import { ScrapedPostDetails, SzuruSiteConfig } from "~/models";
import { SzuruSiteConfig } from "~/config"; import { UploadMode } from "neo-scraper";
/** /**
* A 1:1 wrapper around the szurubooru API. * A 1:1 wrapper around the szurubooru API.
@ -64,7 +68,7 @@ export default class SzurubooruApi {
offset = 0, offset = 0,
limit = 100, limit = 100,
fields?: TagFields[], fields?: TagFields[],
cancelToken?: CancelToken cancelToken?: CancelToken,
): Promise<TagsResult> { ): Promise<TagsResult> {
const params = new URLSearchParams(); const params = new URLSearchParams();
params.append("offset", offset.toString()); params.append("offset", offset.toString());
@ -100,6 +104,40 @@ export default class SzurubooruApi {
return (await this.apiPost("posts", obj)).data; return (await this.apiPost("posts", obj)).data;
} }
async createPool(name: string, category: string, posts?: number[]): Promise<Pool> {
const obj = <any>{
names: [name],
category,
};
if (posts) {
obj.posts = posts;
}
return (await this.apiPost("pool", obj)).data;
}
async getPools(
query?: string,
offset = 0,
limit = 100,
fields?: PoolFields[],
cancelToken?: CancelToken,
): Promise<PoolsResult> {
const params = new URLSearchParams();
params.append("offset", offset.toString());
params.append("limit", limit.toString());
if (fields && fields.length > 0) params.append("fields", fields.join());
if (query) params.append("query", query);
return (await this.apiGet("pools?" + params.toString(), {}, cancelToken)).data;
}
async updatePool(id: number, updateRequest: UpdatePoolRequest): Promise<Pool> {
return (await this.apiPut("pool/" + id, updateRequest)).data;
}
async reverseSearch(contentUrl: string): Promise<ImageSearchResult> { async reverseSearch(contentUrl: string): Promise<ImageSearchResult> {
const obj = { contentUrl }; const obj = { contentUrl };
return (await this.apiPost("posts/reverse-search", obj)).data; return (await this.apiPost("posts/reverse-search", obj)).data;
@ -110,11 +148,42 @@ export default class SzurubooruApi {
return (await this.apiPost("posts/reverse-search", obj)).data; return (await this.apiPost("posts/reverse-search", obj)).data;
} }
async uploadTempFile(contentUrl: string): Promise<TemporaryFileUploadResult> { async uploadTempFile(contentUrl: string, uploadMode: UploadMode): Promise<TemporaryFileUploadResult> {
// For some sources we need to download the image to the client and then upload it to szurubooru.
// We can't just pass the contentUrl because that would trigger the bot/hotlink protection.
if (uploadMode == "content") {
console.log("Upload from content");
return this.uploadTempFileFromContent(contentUrl);
} else {
console.log("Upload from URL");
return this.uploadTempFileFromUrl(contentUrl);
}
}
async uploadTempFileFromUrl(contentUrl: string): Promise<TemporaryFileUploadResult> {
const obj = { contentUrl }; const obj = { contentUrl };
return (await this.apiPost("uploads", obj)).data; return (await this.apiPost("uploads", obj)).data;
} }
async uploadTempFileFromContent(contentUrl: string): Promise<TemporaryFileUploadResult> {
const content = await (await fetch(contentUrl)).blob();
const fullUrl = this.apiUrl + "uploads";
const formData = new FormData();
formData.append("content", content);
const config: AxiosRequestConfig = {
method: "POST",
url: fullUrl,
data: formData,
};
config.headers = { ...this.baseHeaders, "Content-Type": "multipart/form-data" };
return (await this.execute(config)).data;
}
static createFromConfig(siteConfig: SzuruSiteConfig): SzurubooruApi { static createFromConfig(siteConfig: SzuruSiteConfig): SzurubooruApi {
return new SzurubooruApi(siteConfig.domain, siteConfig.username, siteConfig.authToken); return new SzurubooruApi(siteConfig.domain, siteConfig.username, siteConfig.authToken);
} }

View File

@ -3,9 +3,11 @@
*/ */
export type Safety = "safe" | "sketchy" | "unsafe"; export type Safety = "safe" | "sketchy" | "unsafe";
export type TagFields = "names" | "category" | "usages" | "implications"; export type TagFields = "version" | "names" | "category" | "usages" | "implications";
export type PoolFields = "version" | "id" | "names" | "category" | "description" | "postCount" | "posts";
export type TagsResult = PagedSearchResult<Tag>; export type TagsResult = PagedSearchResult<Tag>;
export type PoolsResult = PagedSearchResult<Pool>;
export type TagCategoriesResult = UnpagedSearchResult<TagCategory>; export type TagCategoriesResult = UnpagedSearchResult<TagCategory>;
export interface SzuruError { export interface SzuruError {
@ -37,18 +39,28 @@ export interface MicroTag {
usages: number; usages: number;
} }
export interface Tag { export interface Tag extends MicroTag {
names: string[];
category: string;
version: number; version: number;
description?: string; // Markdown description?: string; // Markdown
creationTime: Date; creationTime: Date;
lastEditTime?: Date; lastEditTime?: Date;
usages: number;
suggestions: MicroTag[]; suggestions: MicroTag[];
implications: MicroTag[]; implications: MicroTag[];
} }
/**
* All fields can be optional.
*/
export interface Pool {
id: number;
names: string[];
category: string;
version: number;
description: null;
postCount: number;
posts: MicroPost[];
}
export interface TagCategory { export interface TagCategory {
name: string; name: string;
version: number; version: number;
@ -62,8 +74,12 @@ export interface MicroUser {
avatarUrl: string; avatarUrl: string;
} }
export interface Post { export interface MicroPost {
id: number; id: number;
thumbnailUrl: string;
}
export interface Post extends MicroPost {
version: number; version: number;
creationTime: Date; creationTime: Date;
lastEditTime?: Date; lastEditTime?: Date;
@ -76,7 +92,6 @@ export interface Post {
canvasWidth: number; canvasWidth: number;
canvasHeight: number; canvasHeight: number;
contentUrl: string; contentUrl: string;
thumbnailUrl: string;
flags: string[]; flags: string[];
tags: MicroTag[]; tags: MicroTag[];
relations: any[]; // MicroPost resource relations: any[]; // MicroPost resource
@ -127,3 +142,9 @@ export interface UpdatePostRequest {
contentUrl: string | undefined; contentUrl: string | undefined;
contentToken: string | undefined; contentToken: string | undefined;
} }
export interface UpdatePoolRequest {
version: number;
// names?: string[];
posts: number[];
}

View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

View File

@ -1,4 +1,4 @@
import { encodeTagName, getErrorMessage } from "~/utils"; import { encodeTagName, getErrorMessage, getUrl } from "~/utils";
import { import {
BrowserCommand, BrowserCommand,
PostUploadCommandData, PostUploadCommandData,
@ -8,7 +8,7 @@ import {
PostUpdateCommandData, PostUpdateCommandData,
FetchCommandData, FetchCommandData,
} from "~/models"; } from "~/models";
import { PostAlreadyUploadedError } from "~/api/models"; import { PostAlreadyUploadedError, UpdatePoolRequest } from "~/api/models";
import SzurubooruApi from "~/api"; import SzurubooruApi from "~/api";
// Only on dev mode // Only on dev mode
@ -19,6 +19,13 @@ if (import.meta.hot) {
import("./contentScriptHMR"); import("./contentScriptHMR");
} }
browser.notifications.onClicked.addListener((url) => {
if (url) {
browser.tabs.create({ url });
browser.notifications.clear(url);
}
});
async function uploadPost(data: PostUploadCommandData) { async function uploadPost(data: PostUploadCommandData) {
const info: PostUploadInfo = { const info: PostUploadInfo = {
state: "uploading", state: "uploading",
@ -26,7 +33,7 @@ async function uploadPost(data: PostUploadCommandData) {
const pushInfo = () => const pushInfo = () =>
browser.runtime.sendMessage( browser.runtime.sendMessage(
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.selectedSite.id, data.post.id, info)) new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.selectedSite.id, data.post.id, info)),
); );
try { try {
@ -36,6 +43,12 @@ async function uploadPost(data: PostUploadCommandData) {
pushInfo(); pushInfo();
const contentToken = data.post.instanceSpecificData[data.selectedSite.id]?.contentToken; const contentToken = data.post.instanceSpecificData[data.selectedSite.id]?.contentToken;
if (!contentToken) {
// TODO: If donmai URL is the source then we need to do the uploadTempFileFromContent here!
console.log("contentToken is undefined. This could be a problem for some sources!");
}
const createdPost = await szuru.createPost(data.post, contentToken); const createdPost = await szuru.createPost(data.post, contentToken);
info.state = "uploaded"; info.state = "uploaded";
@ -73,7 +86,7 @@ async function uploadPost(data: PostUploadCommandData) {
categoriesChangedCount++; categoriesChangedCount++;
} else { } else {
console.log( console.log(
`Not adding the '${wantedCategory}' category to the tag '${tags[i].names[0]}' because the szurubooru instance does not have this category.` `Not adding the '${wantedCategory}' category to the tag '${tags[i].names[0]}' because the szurubooru instance does not have this category.`,
); );
} }
} }
@ -84,11 +97,49 @@ async function uploadPost(data: PostUploadCommandData) {
pushInfo(); pushInfo();
} }
} }
// TODO: This code shouldn't all be in the same try catch.
// Add post to pools
for (const scrapedPool of data.post.pools) {
// Attention! Don't use the .name getter as it does not exist. Just use names[0].
const existingPools = await szuru.getPools(encodeTagName(scrapedPool.names[0]), 0, 1, ["id", "posts", "version"]);
if (existingPools.results.length == 0) {
// Pool does not exist. Create a new pool and add the post to it in one API call.
console.log(`Creating new pool ${scrapedPool.names[0]} and adding post ${createdPost.id}.`);
await szuru.createPool(scrapedPool.names[0], "default", [createdPost.id]);
} else {
// Pool exists, so add it to the existing pool.
const existingPool = existingPools.results[0];
const posts = existingPool.posts.map((x) => x.id);
posts.push(createdPost.id);
console.log(`Adding post ${createdPost.id} to existing pool ${existingPool.id}`);
const updateRequest = <UpdatePoolRequest>{
version: existingPool.version,
posts,
};
await szuru.updatePool(existingPool.id, updateRequest);
}
}
if (data.sendNotifications && browser.notifications) {
const createdPostUrl = getUrl(data.selectedSite.domain, "post", createdPost.id.toString());
browser.notifications.create(createdPostUrl, {
type: "basic",
iconUrl: browser.runtime.getURL("assets/icon-128.png"),
title: data.selectedSite.domain,
message: `Uploaded ${data.post.contentUrl}`,
});
}
} catch (ex: any) { } catch (ex: any) {
console.error(ex);
if (ex.name && ex.name == "PostAlreadyUploadedError") { if (ex.name && ex.name == "PostAlreadyUploadedError") {
const otherPostId = (ex as PostAlreadyUploadedError).otherPostId; const otherPostId = (ex as PostAlreadyUploadedError).otherPostId;
browser.runtime.sendMessage( browser.runtime.sendMessage(
new BrowserCommand("set_exact_post_id", new SetExactPostId(data.selectedSite.id, data.post.id, otherPostId)) new BrowserCommand("set_exact_post_id", new SetExactPostId(data.selectedSite.id, data.post.id, otherPostId)),
); );
// We don't set an error message, because we have a different message for posts that are already uploaded. // We don't set an error message, because we have a different message for posts that are already uploaded.
} else { } else {
@ -110,8 +161,8 @@ async function updatePost(data: PostUpdateCommandData) {
browser.runtime.sendMessage( browser.runtime.sendMessage(
new BrowserCommand( new BrowserCommand(
"set_post_update_info", "set_post_update_info",
new SetPostUploadInfoData(data.selectedSite.id, `merge-${data.postId}`, info) new SetPostUploadInfoData(data.selectedSite.id, `merge-${data.postId}`, info),
) ),
); );
try { try {
@ -124,6 +175,7 @@ async function updatePost(data: PostUpdateCommandData) {
info.state = "uploaded"; info.state = "uploaded";
pushInfo(); pushInfo();
} catch (ex: any) { } catch (ex: any) {
console.error(ex);
info.state = "error"; info.state = "error";
info.error = getErrorMessage(ex); info.error = getErrorMessage(ex);
pushInfo(); pushInfo();

View File

@ -0,0 +1,154 @@
<script setup lang="ts">
import axios, { CancelTokenSource } from "axios";
const inputText = ref("");
const autocompleteShown = ref(false);
const cancelSource = ref<CancelTokenSource | undefined>(undefined);
const autocompleteIndex = ref(-1);
const props = defineProps({
autocompleteItems: {
type: Array<any>,
required: true,
},
});
const emit = defineEmits(["addItem", "addFromCurrentInput", "autocompletePopulator"]);
function addItem(item: any) {
emit("addItem", item);
}
async function onAddItemKeyUp(e: KeyboardEvent) {
await autocompletePopulator((<HTMLInputElement>e.target).value);
}
function addItemFromCurrentInput() {
emit("addFromCurrentInput", inputText.value);
inputText.value = ""; // Reset input
// Only needed when the button is clicked
// When this is triggered by the enter key the `onAddItemKeyUp` will internally also hide the autocomplete.
// Though hiding it twice doesn't hurt so we don't care.
hideAutocomplete();
}
function onAddItemKeyDown(e: KeyboardEvent) {
if (e.code == "ArrowDown") {
e.preventDefault();
if (autocompleteIndex.value < props.autocompleteItems.length - 1) {
autocompleteIndex.value++;
}
} else if (e.code == "ArrowUp") {
e.preventDefault();
if (autocompleteIndex.value >= 0) {
autocompleteIndex.value--;
}
} else if (e.code == "Enter") {
if (autocompleteIndex.value == -1) {
addItemFromCurrentInput();
} else {
// Add auto completed item
const itemToAdd = props.autocompleteItems[autocompleteIndex.value];
addItem(itemToAdd);
inputText.value = ""; // Reset input
}
}
}
function onClickAutocompleteItem(item: any) {
addItem(item);
inputText.value = ""; // Reset input
autocompleteShown.value = false; // Hide autocomplete list
}
function hideAutocomplete() {
autocompleteIndex.value = -1;
autocompleteShown.value = false;
}
async function autocompletePopulator(input: string) {
// Based on https://www.w3schools.com/howto/howto_js_autocomplete.asp
// Hide autocomplete when the input is empty, and don't do anything else.
if (input.length == 0) {
hideAutocomplete();
return;
}
// Cancel previous request, not sure if this still works after the refactor.
if (cancelSource.value) {
cancelSource.value.cancel();
}
cancelSource.value = axios.CancelToken.source();
emit("autocompletePopulator", inputText.value, cancelSource.value.token);
}
watch(props, (newValue) => {
if (newValue.autocompleteItems.length > 0) {
autocompleteShown.value = true;
}
});
</script>
<template>
<div style="display: flex; flex-direction: column">
<div style="display: flex">
<input type="text" v-model="inputText" @keyup="onAddItemKeyUp" @keydown="onAddItemKeyDown" autocomplete="off" />
<button class="primary" style="margin-left: 5px" @click="addItemFromCurrentInput">Add</button>
</div>
<div class="autocomplete-items" v-bind:class="{ show: autocompleteShown }">
<div
v-for="(item, idx) in autocompleteItems"
@click="onClickAutocompleteItem(item)"
:key="item.name"
:class="{
active: idx == autocompleteIndex,
}"
>
<slot :item="item"></slot>
</div>
</div>
</div>
</template>
<style lang="scss">
.autocomplete-items {
position: absolute;
z-index: 10;
background-color: var(--bg-main-color);
border: 2px solid var(--primary-color);
margin-top: 34px;
display: none;
&.show {
display: block;
}
> div {
cursor: pointer;
padding: 2px 4px;
display: flex;
align-items: center;
gap: 0.5em;
&:hover {
background: var(--primary-color);
> span {
color: var(--text-color);
}
}
}
> div.active {
background: var(--primary-color);
> span {
color: var(--text-color);
}
}
}
</style>

View File

@ -0,0 +1,33 @@
<script setup lang="ts">
import type { PropType } from "vue";
import type { PoolDetails } from "~/models";
import { breakTagName } from "~/utils";
defineProps({
pools: Array as PropType<PoolDetails[]>,
showPostCount: Boolean,
showRemovePool: Boolean,
});
defineEmits(["removePool"]);
</script>
<template>
<ul class="compact-pools">
<li v-for="pool in pools" :key="pool.name">
<a v-if="showRemovePool" class="remove-tag" @click="$emit('removePool', pool)">x</a>
<span class="tag-general" v-html="breakTagName(pool.name)"></span>
<span v-if="showPostCount" class="tag-usages tag-usages-reserve-space">{{
pool.postCount ? pool.postCount : ""
}}</span>
</li>
</ul>
</template>
<style scoped lang="scss">
/* Hacky way to stop the layout from resizing when we lazy load the usage count. */
.tag-usages-reserve-space {
min-width: 5ch;
/* 5 character width */
display: inline-block;
}
</style>

View File

@ -24,7 +24,8 @@ defineEmits(["removeTag"]);
<style scoped lang="scss"> <style scoped lang="scss">
/* Hacky way to stop the layout from resizing when we lazy load the usage count. */ /* Hacky way to stop the layout from resizing when we lazy load the usage count. */
.tag-usages-reserve-space { .tag-usages-reserve-space {
min-width: 5ch; /* 5 character width */ min-width: 5ch;
/* 5 character width */
display: inline-block; display: inline-block;
} }
</style> </style>

View File

@ -0,0 +1,47 @@
<script setup lang="ts">
import { PropType } from "vue";
import { PoolDetails } from "~/models";
import { encodeTagName, getTagClasses } from "~/utils";
import SzurubooruApi from "~/api";
import { CancelToken } from "axios";
const autocompleteItems = ref<PoolDetails[]>([]);
const props = defineProps({
szuru: Object as PropType<SzurubooruApi>,
});
const emit = defineEmits(["addPool"]);
function addPool(tag: PoolDetails) {
emit("addPool", tag);
}
function addPoolFromCurrentInput(input: string) {
addPool(new PoolDetails([input]));
}
async function autocompletePopulator(input: string, ct: CancelToken) {
const query = decodeURIComponent(`*${encodeTagName(input)}*`);
const res = await props.szuru?.getPools(query, 0, 100, ["id", "names", "category", "description", "postCount"], ct);
if (res) {
// TODO: Maybe search on hamming distance or something?
autocompleteItems.value = res.results.map((x) => PoolDetails.fromPool(x));
} else {
autocompleteItems.value = [];
}
}
</script>
<template>
<AutocompleteInput
:autocomplete-items="autocompleteItems"
@add-item="addPool"
@add-from-current-input="addPoolFromCurrentInput"
@autocomplete-populator="autocompletePopulator"
v-slot="slotProps"
>
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
</AutocompleteInput>
</template>

View File

@ -2,7 +2,10 @@
import { ScrapedNote } from "neo-scraper"; import { ScrapedNote } from "neo-scraper";
class Point { class Point {
constructor(public x: any, public y: any) {} constructor(
public x: any,
public y: any,
) {}
} }
// HACK: Copied from old client // HACK: Copied from old client

View File

@ -1,15 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import axios, { CancelTokenSource } from "axios";
import { PropType } from "vue"; import { PropType } from "vue";
import SzurubooruApi from "~/api";
import { TagDetails } from "~/models"; import { TagDetails } from "~/models";
import { encodeTagName, getTagClasses } from "~/utils"; import { encodeTagName, getTagClasses } from "~/utils";
import SzurubooruApi from "~/api";
import { CancelToken } from "axios";
const addTagInput = ref(""); const autocompleteItems = ref<TagDetails[]>([]);
const autocompleteShown = ref(false);
const autocompleteTags = ref<TagDetails[]>([]);
const cancelSource = ref<CancelTokenSource | undefined>(undefined);
const autocompleteIndex = ref(-1);
const props = defineProps({ const props = defineProps({
szuru: Object as PropType<SzurubooruApi>, szuru: Object as PropType<SzurubooruApi>,
@ -20,148 +16,33 @@ function addTag(tag: TagDetails) {
emit("addTag", tag); emit("addTag", tag);
} }
async function onAddTagKeyUp(e: KeyboardEvent) { function addTagFromCurrentInput(input: string) {
await autocompletePopulator((<HTMLInputElement>e.target).value); addTag(new TagDetails([input]));
} }
function addTagFromCurrentInput() { async function autocompletePopulator(input: string, ct: CancelToken) {
addTag(new TagDetails([addTagInput.value]));
addTagInput.value = ""; // Reset input
// Only needed when the button is clicked
// When this is triggered by the enter key the `onAddTagKeyUp` will internally also hide the autocomplete.
// Though hiding it twice doesn't hurt so we don't care.
hideAutocomplete();
// TODO: Do we also want to add the implications?
// Answer: Probably not, because if the user wanted to have implications they should've clicked/selected the autocomplete entry.
}
function onAddTagKeyDown(e: KeyboardEvent) {
if (e.code == "ArrowDown") {
e.preventDefault();
if (autocompleteIndex.value < autocompleteTags.value.length - 1) {
autocompleteIndex.value++;
}
} else if (e.code == "ArrowUp") {
e.preventDefault();
if (autocompleteIndex.value >= 0) {
autocompleteIndex.value--;
}
} else if (e.code == "Enter") {
if (autocompleteIndex.value == -1) {
addTagFromCurrentInput();
} else {
// Add auto completed tag
const tagToAdd = autocompleteTags.value[autocompleteIndex.value];
addTag(tagToAdd);
addTagInput.value = ""; // Reset input
}
}
}
function onClickAutocompleteTagItem(tag: TagDetails) {
addTag(tag);
addTagInput.value = ""; // Reset input
autocompleteShown.value = false; // Hide autocomplete list
}
function hideAutocomplete() {
autocompleteIndex.value = -1;
autocompleteShown.value = false;
}
async function autocompletePopulator(input: string) {
// Based on https://www.w3schools.com/howto/howto_js_autocomplete.asp
// Hide autocomplete when the input is empty, and don't do anything else.
if (input.length == 0) {
hideAutocomplete();
return;
}
// Cancel previous request
if (cancelSource.value) {
cancelSource.value.cancel();
}
cancelSource.value = axios.CancelToken.source();
const query = decodeURIComponent(`*${encodeTagName(input)}* sort:usages`); const query = decodeURIComponent(`*${encodeTagName(input)}* sort:usages`);
const res = await props.szuru?.getTags( const res = await props.szuru?.getTags(query, 0, 100, ["names", "category", "usages", "implications"], ct);
query,
0,
100,
["names", "category", "usages", "implications"],
cancelSource.value.token
);
if (res) { if (res) {
// TODO: Maybe search on hamming distance or something? // TODO: Maybe search on hamming distance or something?
autocompleteTags.value = res.results.map((x) => TagDetails.fromTag(x)); autocompleteItems.value = res.results.map((x) => TagDetails.fromTag(x));
if (autocompleteTags.value.length > 0) autocompleteShown.value = true; console.dir(autocompleteItems.value);
} else { } else {
autocompleteTags.value = []; autocompleteItems.value = [];
} }
} }
</script> </script>
<template> <template>
<div style="display: flex; flex-direction: column"> <AutocompleteInput
<div style="display: flex"> :autocomplete-items="autocompleteItems"
<input type="text" v-model="addTagInput" @keyup="onAddTagKeyUp" @keydown="onAddTagKeyDown" autocomplete="off" /> @add-item="addTag"
<button class="primary" style="margin-left: 5px" @click="addTagFromCurrentInput">Add</button> @add-from-current-input="addTagFromCurrentInput"
</div> @autocomplete-populator="autocompletePopulator"
v-slot="slotProps"
<div class="autocomplete-items" v-bind:class="{ show: autocompleteShown }"> >
<div <span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
v-for="(tag, idx) in autocompleteTags" <span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
@click="onClickAutocompleteTagItem(tag)" </AutocompleteInput>
:key="tag.name"
:class="{
active: idx == autocompleteIndex,
}"
>
<span :class="getTagClasses(tag)">{{ tag.name }}</span>
<span class="tag-usages">{{ tag.usages ? tag.usages : "" }}</span>
</div>
</div>
</div>
</template> </template>
<style scoped lang="scss">
.autocomplete-items {
position: absolute;
z-index: 10;
background-color: var(--bg-main-color);
border: 2px solid var(--primary-color);
margin-top: 34px;
display: none;
&.show {
display: block;
}
> div {
cursor: pointer;
padding: 2px 4px;
display: flex;
align-items: center;
gap: 0.5em;
&:hover {
background: var(--primary-color);
> span {
color: var(--text-color);
}
}
}
> div.active {
background: var(--primary-color);
> span {
color: var(--text-color);
}
}
}
</style>

View File

@ -8,15 +8,11 @@ const storageLocal: StorageLikeAsync = {
}, },
setItem(key: string, value: string) { setItem(key: string, value: string) {
console.log("setItem");
console.dir(value);
return storage.local.set({ [key]: value }); return storage.local.set({ [key]: value });
}, },
async getItem(key: string) { async getItem(key: string) {
console.log("getItem");
const item = (await storage.local.get(key))[key]; const item = (await storage.local.get(key))[key];
console.dir(item);
return item; return item;
}, },
}; };
@ -24,5 +20,5 @@ const storageLocal: StorageLikeAsync = {
export const useStorageLocal = <T>( export const useStorageLocal = <T>(
key: string, key: string,
initialValue: MaybeRef<T>, initialValue: MaybeRef<T>,
options?: UseStorageAsyncOptions<T> options?: UseStorageAsyncOptions<T>,
): RemovableRef<T> => useStorageAsync(key, initialValue, storageLocal, options); ): RemovableRef<T> => useStorageAsync(key, initialValue, storageLocal, options);

View File

@ -1,6 +0,0 @@
export class SzuruSiteConfig {
id = window.crypto.randomUUID();
domain = "https://example.com";
username = "user";
authToken = "";
}

23
src/dynamicStyle.ts Normal file
View File

@ -0,0 +1,23 @@
import { TagCategoryColor } from "./models";
export function makeCssName(prefix: string, name: string) {
return prefix + "-" + name.replace(/[^a-z0-9]/g, "_");
}
export function refreshTagCategoryColorMap(tagCategories: TagCategoryColor[], styleElement?: HTMLStyleElement) {
if (styleElement) {
document.head.removeChild(styleElement);
}
styleElement = document.createElement("style");
document.head.appendChild(styleElement);
for (const category of tagCategories) {
const ruleName = makeCssName("tag", category.name);
if (styleElement.sheet) {
styleElement.sheet.insertRule(`.${ruleName} { color: ${category.color} }`, styleElement.sheet.cssRules.length);
} else {
console.error("styleElement.sheet is undefined. This should never happen!");
}
}
return styleElement;
}

View File

@ -11,7 +11,7 @@ export async function getManifest() {
const manifest: Manifest.WebExtensionManifest = { const manifest: Manifest.WebExtensionManifest = {
name: pkg.displayName, name: pkg.displayName,
description: pkg.description, description: pkg.description,
version: process.env.SZ_VERSION || pkg.version, version: process.env.VITE_SZ_VERSION || pkg.version,
manifest_version: 2, manifest_version: 2,
icons: { icons: {
16: "./assets/icon-128.png", 16: "./assets/icon-128.png",
@ -31,20 +31,27 @@ export async function getManifest() {
page: "./dist/background/index.html", page: "./dist/background/index.html",
// persistent: false, // persistent: false,
}, },
permissions: ["storage", "activeTab", "webRequest", "webRequestBlocking", "<all_urls>"], permissions: ["storage", "activeTab", "webRequest", "webRequestBlocking", "notifications", "<all_urls>"],
content_scripts: [ content_scripts: [
{ {
matches: ["http://*/*", "https://*/*"], matches: ["http://*/*", "https://*/*"],
js: ["./dist/contentScripts/index.global.js"], js: ["./dist/contentScripts/index.global.js"],
}, },
], ],
browser_specific_settings: {
gecko: {
id: "{13372607-2257-4360-8f51-5ce66fa73350}",
},
},
}; };
if (process.env.SZ_GECKO_ID) {
manifest.browser_specific_settings = {
gecko: {
id: `{${process.env.SZ_GECKO_ID}}`,
strict_min_version: "113.0",
},
gecko_android: {
strict_min_version: "113.0",
},
};
}
if (isDev) { if (isDev) {
// for content script, as browsers will cache them for each reload, // for content script, as browsers will cache them for each reload,
// we use a background script to always inject the latest version // we use a background script to always inject the latest version

View File

@ -1,11 +1,14 @@
import { BooruTypes, ContentType, ScrapedNote, ScrapedPost, ScrapedTag } from "neo-scraper"; import { BooruTypes, ContentType, ScrapedNote, ScrapedPost, ScrapedTag, UploadMode } from "neo-scraper";
import { MicroTag, Tag, UpdatePostRequest } from "~/api/models"; import { MicroTag, Pool, Tag, UpdatePostRequest } from "~/api/models";
import { SzuruSiteConfig } from "~/config";
export class TagDetails { export class TagDetails {
public implications: TagDetails[] = []; public implications: TagDetails[] = [];
constructor(public names: string[], public category?: string, public usages?: number) {} constructor(
public names: string[],
public category?: string,
public usages?: number,
) {}
get name() { get name() {
return this.names[0]; return this.names[0];
@ -30,6 +33,22 @@ export class TagDetails {
} }
} }
export class PoolDetails {
constructor(
public names: string[],
public category?: string,
public postCount?: number,
) {}
get name() {
return this.names[0];
}
static fromPool(pool: Pool) {
return new PoolDetails(pool.names, pool.category, pool.postCount);
}
}
export class InstanceSpecificData { export class InstanceSpecificData {
contentToken?: string; contentToken?: string;
genericError?: string; genericError?: string;
@ -45,6 +64,7 @@ export class ScrapedPostDetails {
id = window.crypto.randomUUID(); id = window.crypto.randomUUID();
name = ""; name = "";
tags: TagDetails[] = []; tags: TagDetails[] = [];
pools: PoolDetails[] = [];
notes: ScrapedNote[]; notes: ScrapedNote[];
contentUrl: string; contentUrl: string;
extraContentUrl: string | undefined; extraContentUrl: string | undefined;
@ -53,7 +73,8 @@ export class ScrapedPostDetails {
contentType: ContentType; contentType: ContentType;
contentSubType: string | undefined; contentSubType: string | undefined;
rating: BooruTypes.SafetyRating; rating: BooruTypes.SafetyRating;
source = ""; source;
uploadMode: UploadMode;
referrer?: string; referrer?: string;
resolution?: [number, number]; resolution?: [number, number];
instanceSpecificData: MappedInstanceSpecificData = {}; instanceSpecificData: MappedInstanceSpecificData = {};
@ -70,6 +91,7 @@ export class ScrapedPostDetails {
this.tags = post.tags.map((x) => TagDetails.fromScapedTag(x)); this.tags = post.tags.map((x) => TagDetails.fromScapedTag(x));
this.notes = post.notes; this.notes = post.notes;
this.resolution = post.resolution; this.resolution = post.resolution;
this.uploadMode = post.uploadMode;
} }
} }
@ -84,7 +106,10 @@ export interface SimpleSimilarPost {
} }
export class SimilarPostInfo { export class SimilarPostInfo {
constructor(public readonly id: number, public readonly percentage: number) {} constructor(
public readonly id: number,
public readonly percentage: number,
) {}
} }
export type PostUploadState = "uploading" | "uploaded" | "error"; export type PostUploadState = "uploading" | "uploaded" | "error";
@ -120,18 +145,26 @@ export class BrowserCommand<T = any> {
} }
export class PostUploadCommandData { export class PostUploadCommandData {
constructor(public readonly post: ScrapedPostDetails, public readonly selectedSite: SzuruSiteConfig) {} constructor(
public readonly post: ScrapedPostDetails,
public readonly selectedSite: SzuruSiteConfig,
public readonly sendNotifications: boolean,
) {}
} }
export class SetPostUploadInfoData { export class SetPostUploadInfoData {
constructor(public instanceId: string, public postId: string, public info: PostUploadInfo) {} constructor(
public instanceId: string,
public postId: string,
public info: PostUploadInfo,
) {}
} }
export class SetExactPostId { export class SetExactPostId {
constructor( constructor(
public readonly instanceId: string, public readonly instanceId: string,
public readonly postId: string, public readonly postId: string,
public readonly exactPostId: number public readonly exactPostId: number,
) {} ) {}
} }
@ -139,10 +172,34 @@ export class PostUpdateCommandData {
constructor( constructor(
public readonly postId: number, public readonly postId: number,
public readonly updateRequest: UpdatePostRequest, public readonly updateRequest: UpdatePostRequest,
public readonly selectedSite: SzuruSiteConfig public readonly selectedSite: SzuruSiteConfig,
) {} ) {}
} }
export class FetchCommandData { export class FetchCommandData {
constructor(public readonly url: string, public readonly options: RequestInit | undefined = undefined) {} constructor(
public readonly url: string,
public readonly options: RequestInit | undefined = undefined,
) {}
} }
export class SzuruSiteConfig {
id = window.crypto.randomUUID();
domain = "https://example.com";
username = "user";
authToken = "";
}
export class TagCategoryColor {
constructor(
public name: string,
public color: string,
) {}
}
export const getDefaultTagCategories = () => [
new TagCategoryColor("copyright", "#a0a"),
new TagCategoryColor("character", "#0a0"),
new TagCategoryColor("artist", "#a00"),
new TagCategoryColor("meta", "#f80"),
];

View File

@ -1,12 +1,26 @@
<script setup lang="ts"> <script setup lang="ts">
import { useColorMode } from "@vueuse/core"; import { useColorMode } from "@vueuse/core";
import SzuruWrapper from "~/api"; import SzuruWrapper from "~/api";
import { SzuruSiteConfig } from "~/config";
import { cfg } from "~/stores"; import { cfg } from "~/stores";
import { getErrorMessage } from "~/utils"; import { getErrorMessage } from "~/utils";
let statusText = ref("Version " + browser.runtime.getManifest().version); import TabView from "primevue/tabview";
let statusType = ref("status-quiet"); import TabPanel from "primevue/tabpanel";
import DataTable from "primevue/datatable";
import Column from "primevue/column";
import { TagDetails, SzuruSiteConfig, TagCategoryColor, getDefaultTagCategories } from "~/models";
import SzurubooruApi from "~/api";
type StatusType = "success" | "error" | "quiet";
const statusText = ref("");
const statusType = ref("status-quiet");
const versionInfo = "Version: " + (import.meta.env.VITE_SZ_VERSION ?? browser.runtime.getManifest().version);
const columns = ref([
{ field: "name", header: "Category name" },
{ field: "color", header: "CSS color" },
]);
const selectedSite = computed(() => { const selectedSite = computed(() => {
if (cfg.value.selectedSiteId) { if (cfg.value.selectedSiteId) {
@ -14,7 +28,7 @@ const selectedSite = computed(() => {
} }
}); });
type StatusType = "success" | "error" | "quiet"; const mode = useColorMode({ emitAuto: true });
async function testConnection() { async function testConnection() {
if ( if (
@ -65,126 +79,306 @@ function removeSelectedSite() {
} }
} }
let mode = useColorMode({ emitAuto: true }); function resetTagCategories() {
cfg.value.tagCategories.splice(0);
cfg.value.tagCategories.push(...getDefaultTagCategories());
}
function addTagCategory() {
cfg.value.tagCategories.push(new TagCategoryColor("category", "#abcdef"));
}
async function importTagCategoriesFromInstance() {
const szuruConfig = cfg.value.sites.find((x) => x.id == cfg.value.selectedSiteId)!;
const szuru = SzurubooruApi.createFromConfig(szuruConfig);
const cats = (await szuru.getTagCategories()).results;
for (const cat of cats) {
if (cat.name == "default") continue;
if (!cfg.value.tagCategories.find((x) => x.name == cat.name)) {
cfg.value.tagCategories.push(new TagCategoryColor(cat.name, cat.color));
}
}
}
function addTagIgnore() {
cfg.value.tagIgnores.push(new TagDetails([""]));
}
function resetTagIgnores() {
cfg.value.tagIgnores.splice(0);
}
// For debugging
const wnd = window as any;
wnd.szc_get_config = () => JSON.parse(JSON.stringify(cfg.value));
wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
</script> </script>
<template> <template>
<div class="content-holder"> <div class="content-holder">
<div class="content-wrapper flex flex-wrap gap-3"> <div class="content-wrapper flex flex-auto flex-column gap-3">
<div class="flex-fit"><strong>SzuruChrome Settings</strong></div> <div><strong>SzuruChrome Settings</strong></div>
<div class="flex-fit"> <TabView>
<div class="fit flex flex-wrap"> <TabPanel header="General">
<div class="flex-fit"> <div class="grid">
<label>Szurubooru Instances</label> <div class="col-12 md:col-6">
<label>
<input type="checkbox" v-model="cfg.addPageUrlToSource" />
Add page URL to the source list
</label>
<p class="hint">
This will add the current page URL (e.g. the booru link) to the source list in addition to the actual
source (e.g. twitter/pixiv/artstation). Note: if the source is empty/not detected then the page URL will
always be used as fallback source.
</p>
</div>
<!-- This isn't perfectly responsive for very small devices. --> <div class="col-12 md:col-6">
<div class="fit flex gap-1 flex-fit"> <label>
<select v-model="cfg.selectedSiteId"> <input type="checkbox" v-model="cfg.addAllParsedTags" />
<option v-for="site in cfg.sites" :key="site.id" :value="site.id"> Automatically import all tags on supported pages
{{ site.username }} @ {{ site.domain }} </label>
</option> <p class="hint">
This will automatically import all tags, including their categories, on supported pages such as Danbooru
and Zerochan.
</p>
</div>
<div class="col-12 md:col-6">
<label>
<input type="checkbox" v-model="cfg.alwaysUploadAsContent" />
Always upload as content
</label>
<p class="hint">This will always upload the image content directly, instead of as an URL</p>
</div>
<div class="col-12 md:col-6">
<label>
<input type="checkbox" v-model="cfg.sendUploadNotifications" />
Send browser notifications after uploading
</label>
<p class="hint">
This will send a browser notification after a successful upload. Clicking the notification will open the
uploaded post in a new tab.
</p>
</div>
<span class="col-12 status-quiet">{{ versionInfo }}</span>
</div>
</TabPanel>
<TabPanel header="Interface">
<div class="grid">
<div class="col-12 md:col-6 mb-2">
<label>Theme</label>
<select v-model="mode">
<option value="auto">System</option>
<option value="light">Light</option>
<option value="dark">Dark</option>
</select> </select>
<button class="primary" @click="addSite">Add</button>
<button class="bg-danger" @click="removeSelectedSite">Remove</button>
</div> </div>
</div> </div>
<div v-if="selectedSite" class="flex-fit flex flex-wrap gap-1 border-box pb2"> <div class="grid">
<div style="flex: 1 1 20ch"> <div class="col-12 md:col-6">
<label>URL</label> <label>
<input <input type="checkbox" v-model="cfg.autoSearchSimilar" />
v-if="selectedSite" Automatically search for similar posts
text="Szurubooru URL" </label>
type="text" <p class="hint">
name="domain" Automatically start searching for similar posts when opening the popup. Enabling this option will hide
v-model.lazy="selectedSite.domain" the "Find Similar" button.
/> </p>
</div> </div>
<div style="flex: 1 1 12ch"> <div class="col-12 md:col-6">
<label>Username</label> <label>
<input text="Username" type="text" name="username" v-model="selectedSite.username" /> <input type="checkbox" v-model="cfg.loadTagCounts" />
Show how often a tag is used in the selected szurubooru instance
</label>
<p class="hint">
Shows how often a given tag is used in the selected szurubooru instance. No number will be displayed
when the tag does not yet exist.
</p>
</div> </div>
<div style="flex: 1 1 28ch"> <div class="col-12 md:col-6">
<label>Authentication token</label> <label>
<input text="Authentication token" type="text" name="token" v-model="selectedSite.authToken" /> <input type="checkbox" v-model="cfg.popup.showSource" />
Show source textbox in popup
</label>
</div>
<div class="col-12 md:col-6">
<label>
<input type="checkbox" v-model="cfg.popup.showPools" />
Show pools in popup
</label>
</div>
<div class="col-12 md:col-6">
<label>
<input type="checkbox" v-model="cfg.popup.showInstancePicker" />
Show instance picker in popup
</label>
</div> </div>
</div> </div>
</div> </TabPanel>
</div>
<div class="flex-fit flex flex-wrap gap-3"> <TabPanel header="Instances">
<div class="settings-block" style="flex: 1 0 10ch"> <div class="formgrid grid">
<label>Theme</label> <div class="field col-12">
<select v-model="mode"> <label>Selected Szurubooru Instance</label>
<option value="auto">System</option>
<option value="light">Light</option>
<option value="dark">Dark</option>
</select>
<p class="hint">This setting auto-saves.</p>
</div>
<div class="settings-block"> <div class="flex gap-1">
<label> <select v-model="cfg.selectedSiteId">
<input type="checkbox" v-model="cfg.autoSearchSimilar" /> <option v-for="site in cfg.sites" :key="site.id" :value="site.id">
Automatically search for similar posts {{ site.username }} @ {{ site.domain }}
</label> </option>
<p class="hint"> </select>
Automatically start searching for similar posts when opening the popup. Enabling this option will hide the
"Find Similar" button.
</p>
</div>
<div class="settings-block"> <button class="primary" @click="addSite">Add</button>
<label> <button class="bg-danger" @click="removeSelectedSite">Remove</button>
<input type="checkbox" v-model="cfg.addPageUrlToSource" /> </div>
Add page URL to the source list </div>
</label>
<p class="hint">
This will add the current page URL (e.g. the booru link) to the source list in addition to the actual source
(e.g. twitter/pixiv/artstation). Note: if the source is empty/not detected then the page URL will always be
used as fallback source.
</p>
</div>
<div class="settings-block"> <template v-if="selectedSite">
<label> <div class="field col-12">
<input type="checkbox" v-model="cfg.loadTagCounts" /> <label>URL</label>
Show how often a tag is used in the selected szurubooru instance <input
</label> v-if="selectedSite"
<p class="hint"> text="Szurubooru URL"
Shows how often a given tag is used in the selected szurubooru instance. No number will be displayed when type="text"
the tag does not yet exist. name="domain"
</p> v-model="selectedSite.domain"
</div> />
</div> </div>
<div class="flex-fit flex flex-wrap justify-between gap-3"> <div class="field col-12 md:col-6">
<span class="status" :class="statusType">{{ statusText }}</span> <label>Username</label>
<input text="Username" type="text" name="username" v-model="selectedSite.username" />
</div>
<div class="flex gap-1"> <div class="field col-12 md:col-6">
<button @click="testConnection">Test connection</button> <label>Authentication token</label>
<!-- <button @click="saveSettings" class="primary">Save settings</button> --> <input text="Authentication token" type="text" name="token" v-model="selectedSite.authToken" />
</div> </div>
</div>
<div class="col-12 flex flex-wrap justify-content-between gap-3">
<span class="status" :class="statusType">{{ statusText }}</span>
<button @click="testConnection">Test connection</button>
</div>
</template>
</div>
</TabPanel>
<TabPanel header="Tags">
<div class="separated-content">
<div class="grid">
<DataTable :value="cfg.tagCategories" table-class="col-12" style="width: 100%">
<Column v-for="col of columns" :key="col.field" :field="col.field" :header="col.header">
<template #body="{ data, field }">
<template v-if="field == 'color'">
<div class="color-preview">
<input type="text" class="color" v-model="data[field]" />
<div
class="preview background-preview"
:style="{ 'border-color': data[field], 'background-color': data[field] }"
></div>
<div
class="preview text-preview"
:style="{ 'border-color': data[field], color: data[field] }"
></div>
</div>
</template>
<template v-else>
<input type="text" :name="field" v-model="data[field]" />
</template>
</template>
</Column>
<Column field="name">
<template #body="{ index }">
<a class="color-primary cursor-pointer" @click="() => cfg.tagCategories.splice(index, 1)">Remove</a>
</template>
</Column>
</DataTable>
<div class="col-12 flex flex-wrap grid grid-nogutter gap-1">
<button class="primary" @click="addTagCategory">Add new category</button>
<button @click="importTagCategoriesFromInstance">Import from active instance</button>
<button class="bg-danger sm:ml-auto" @click="resetTagCategories">Reset to default</button>
</div>
</div>
<!-- TODO: Tag category colors -->
<div class="grid">
<DataTable :value="cfg.tagIgnores" table-class="col-12" style="width: 100%">
<Column field="names" header="Tags to ignore">
<template #body="{ data, field }">
<input type="text" :name="field" v-model="data[field][0]" />
</template>
</Column>
<Column field="remove">
<template #body="{ index }">
<a class="color-primary cursor-pointer" @click="() => cfg.tagIgnores.splice(index, 1)">Remove</a>
</template>
</Column>
</DataTable>
<div class="col-12 flex flex-wrap grid grid-nogutter gap-1">
<button class="primary" @click="addTagIgnore">Add tag</button>
<button class="bg-danger sm:ml-auto" @click="resetTagIgnores">Clear</button>
</div>
</div>
<!-- TODO: Category ignore list -->
</div>
</TabPanel>
<!-- <TabPanel header="About">
<div class="grid">
<div v-for="engine in scraper.engines" :key="engine.name" class="col-12 md:col-4 flex flex-column">
<span class="font-bold">{{ engine.name }}</span>
<span>Features: {{ engine.features.join(", ") }}</span>
<span>Hosts: {{ engine.supportedHosts.join(", ") }}</span>
</div>
</div>
</TabPanel> -->
<!--
<TabPanel header="Developer">
<div class="flex flex-column gap-2">
<b>Config</b>
<Textarea v-model="configText" autoResize rows="16" />
<div class="flex flex-wrap gap-1">
<button class="primary" @click="showConfig">Show config</button>
<button class="bg-danger" @click="importConfig">Import config</button>
</div>
</div>
</TabPanel>
-->
</TabView>
</div> </div>
</div> </div>
</template> </template>
<style lang="scss"> <style lang="scss">
@use "~/styles/main.scss";
.content-holder { .content-holder {
padding: 1.5em; padding: 1.5em;
display: flex; display: flex;
justify-content: center; justify-content: center;
> .content-wrapper { > .content-wrapper {
// box-sizing: border-box; // box-sizing: border-box;
// text-align: left; text-align: left;
// display: inline-block; // display: inline-block;
// flex: auto; // flex: auto;
max-width: 1000px; max-width: 1000px;
@ -198,15 +392,6 @@ html.dark .content-wrapper {
background: var(--section-header-bg-color); background: var(--section-header-bg-color);
} }
.settings-block {
flex: 1 0 200px;
label {
padding: 0;
margin-bottom: 0.3em;
}
}
.hint { .hint {
margin-top: 0.4em; margin-top: 0.4em;
margin-bottom: 0; margin-bottom: 0;
@ -231,11 +416,6 @@ html.dark .content-wrapper {
opacity: 0.6; opacity: 0.6;
} }
label {
display: block;
padding: 0.3em 0;
}
input[type="checkbox"] { input[type="checkbox"] {
margin: 0 3px 0 0; margin: 0 3px 0 0;
} }
@ -249,4 +429,31 @@ input[type="checkbox"] {
flex: 0 0 100%; flex: 0 0 100%;
} }
} }
div.color-preview {
white-space: nowrap;
position: relative;
display: flex;
input {
margin-right: 0.5em;
}
.preview {
display: inline-block;
text-align: center;
padding: 0 0.5em;
border: 2px solid #000;
&::after {
content: "A";
}
}
.background-preview {
border-right: 0;
border-right-color: currentcolor;
color: transparent;
}
}
</style> </style>

View File

@ -1,10 +1,10 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<base target="_blank" /> <base target="_blank" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Options</title> <title>SzuruChrome Settings</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

View File

@ -1,7 +1,12 @@
import { createApp } from "vue"; import { createApp } from "vue";
import PrimeVue from "primevue/config";
import App from "./App.vue"; import App from "./App.vue";
import { setupApp } from "~/logic/common-setup"; import { setupApp } from "~/logic/common-setup";
import "../styles/main.scss";
import "../styles/primevue.scss";
const app = createApp(App); const app = createApp(App);
setupApp(app); setupApp(app);
app.use(PrimeVue);
app.mount("#app"); app.mount("#app");

View File

@ -3,11 +3,21 @@ import { onMounted } from "vue";
import { isChrome } from "~/env"; import { isChrome } from "~/env";
import { BrowserCommand, SetPostUploadInfoData, SetExactPostId } from "~/models"; import { BrowserCommand, SetPostUploadInfoData, SetExactPostId } from "~/models";
import { Runtime, WebRequest } from "webextension-polyfill"; import { Runtime, WebRequest } from "webextension-polyfill";
import { useMergeStore, usePopupStore } from "~/stores"; import { cfg, useMergeStore, usePopupStore } from "~/stores";
import { refreshTagCategoryColorMap } from "~/dynamicStyle";
const pop = usePopupStore(); const pop = usePopupStore();
const merge = useMergeStore(); const merge = useMergeStore();
let el: any;
watch(
cfg,
(value) => {
el = refreshTagCategoryColorMap(value.tagCategories, el);
},
{ immediate: true },
);
onMounted(() => { onMounted(() => {
browser.runtime.onMessage.addListener((cmd: BrowserCommand, _sender: Runtime.MessageSender) => { browser.runtime.onMessage.addListener((cmd: BrowserCommand, _sender: Runtime.MessageSender) => {
console.log("Popup received message:"); console.log("Popup received message:");
@ -83,7 +93,7 @@ onMounted(() => {
}; };
}, },
{ urls: ["<all_urls>"] }, { urls: ["<all_urls>"] },
extraInfoSpec extraInfoSpec,
); );
}); });
</script> </script>

View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

View File

@ -5,12 +5,13 @@ import { Post, UpdatePostRequest } from "~/api/models";
import { isMobile } from "~/env"; import { isMobile } from "~/env";
import { BrowserCommand, PostUpdateCommandData, TagDetails } from "~/models"; import { BrowserCommand, PostUpdateCommandData, TagDetails } from "~/models";
import { cfg, useMergeStore, usePopupStore } from "~/stores"; import { cfg, useMergeStore, usePopupStore } from "~/stores";
import { emptyPost, getUrl } from "~/utils"; import { emptyPost, ensurePostHasContentToken, getUrl } from "~/utils";
const props = defineProps(["siteId", "postId"]); const props = defineProps(["siteId", "postId"]);
const merge = useMergeStore(); const merge = useMergeStore();
const pop = usePopupStore(); const pop = usePopupStore();
// Why is this cloneDeep needed? Or maybe it isn't?
const szuruConfig = cloneDeep(cfg.value.sites.find((x) => x.id == props.siteId))!; const szuruConfig = cloneDeep(cfg.value.sites.find((x) => x.id == props.siteId))!;
const szuru = SzurubooruApi.createFromConfig(szuruConfig); const szuru = SzurubooruApi.createFromConfig(szuruConfig);
@ -128,7 +129,7 @@ async function mergeChanges() {
if ( if (
!isEqual( !isEqual(
newTags, newTags,
existingPostRo.tags.map((x) => x.names[0]) existingPostRo.tags.map((x) => x.names[0]),
) )
) { ) {
req.tags = newTags; req.tags = newTags;
@ -139,7 +140,10 @@ async function mergeChanges() {
} }
if (imageToKeep.value == "new") { if (imageToKeep.value == "new") {
req.contentUrl = scrapedPost?.contentUrl; // In practice this should not be needed, because finding similar posts requires the use of content tokens.
// So if a similar post is found, it means that a contentToken has already been set.
await ensurePostHasContentToken(szuru, scrapedPost, cfg);
req.contentToken = scrapedPost.instanceSpecificData[cfg.value.selectedSiteId!].contentToken!;
} }
if (!req.safety && !req.source && !(req.contentUrl || req.contentToken) && req.tags === undefined) { if (!req.safety && !req.source && !(req.contentUrl || req.contentToken) && req.tags === undefined) {
@ -164,7 +168,7 @@ watch(
// TODO: Implement this. // TODO: Implement this.
sourcesAdded.value = 0; sourcesAdded.value = 0;
sourcesRemoved.value = 0; sourcesRemoved.value = 0;
} },
); );
watch( watch(
@ -175,7 +179,7 @@ watch(
} else if (existingPostRo) { } else if (existingPostRo) {
tagsToAdd.splice(0); tagsToAdd.splice(0);
} }
} },
); );
watch( watch(
@ -186,7 +190,7 @@ watch(
} else if (existingPostRo) { } else if (existingPostRo) {
post.value.source = existingPostRo.source; post.value.source = existingPostRo.source;
} }
} },
); );
watch( watch(
@ -197,7 +201,7 @@ watch(
} else if (existingPostRo) { } else if (existingPostRo) {
post.value.safety = existingPostRo.safety; post.value.safety = existingPostRo.safety;
} }
} },
); );
onMounted(async () => { onMounted(async () => {

View File

@ -2,7 +2,7 @@
import { useDark } from "@vueuse/core"; import { useDark } from "@vueuse/core";
import { cloneDeep } from "lodash"; import { cloneDeep } from "lodash";
import { ScrapeResults } from "neo-scraper"; import { ScrapeResults } from "neo-scraper";
import { getUrl, encodeTagName, getErrorMessage, getPostInfoSummary } from "~/utils"; import { getUrl, encodeTagName, getErrorMessage, getPostInfoSummary, ensurePostHasContentToken } from "~/utils";
import { import {
BrowserCommand, BrowserCommand,
ScrapedPostDetails, ScrapedPostDetails,
@ -11,12 +11,12 @@ import {
SimpleSimilarPost, SimpleSimilarPost,
SimpleImageSearchResult, SimpleImageSearchResult,
PostUploadCommandData, PostUploadCommandData,
SzuruSiteConfig,
PoolDetails,
} from "~/models"; } from "~/models";
import { ImageSearchResult } from "~/api/models";
import { isMobile } from "~/env"; import { isMobile } from "~/env";
import { DeepReadonly } from "vue"; import { DeepReadonly } from "vue";
import { cfg, usePopupStore } from "~/stores"; import { cfg, usePopupStore } from "~/stores";
import { SzuruSiteConfig } from "~/config";
import SzurubooruApi from "~/api"; import SzurubooruApi from "~/api";
const pop = usePopupStore(); const pop = usePopupStore();
@ -40,7 +40,7 @@ const instanceSpecificData = readonly(
if (pop.selectedPost && cfg.value.selectedSiteId) { if (pop.selectedPost && cfg.value.selectedSiteId) {
return pop.selectedPost.instanceSpecificData[cfg.value.selectedSiteId]; return pop.selectedPost.instanceSpecificData[cfg.value.selectedSiteId];
} }
}) }),
); );
watch( watch(
@ -51,7 +51,7 @@ watch(
let selectedPost = pop.posts.find((x) => x.id == value); let selectedPost = pop.posts.find((x) => x.id == value);
if (selectedPost) findSimilar(selectedPost); if (selectedPost) findSimilar(selectedPost);
} }
} },
); );
watch( watch(
@ -66,42 +66,62 @@ watch(
findSimilar(pop.selectedPost); findSimilar(pop.selectedPost);
} }
} }
} },
); );
function openOptionsPage() { function openOptionsPage() {
browser.runtime.openOptionsPage(); browser.runtime.openOptionsPage();
} }
async function getActiveTabId(): Promise<number> { async function getSelectedTabIds(): Promise<number[]> {
const activeTabs = await browser.tabs.query({ const selectedTabs = await browser.tabs.query({
active: true, highlighted: true,
currentWindow: true, currentWindow: true,
}); });
if (activeTabs.length > 0 && activeTabs[0].id) return activeTabs[0].id; if (selectedTabs.length > 0 && selectedTabs[0].id) {
return selectedTabs.filter((tab) => tab.id).map((tab) => tab.id as number);
}
throw new Error("No active tab."); throw new Error("No active tab.");
} }
async function grabPost() { async function grabPost() {
// Get active tab // Get active tab
const activeTabId = await getActiveTabId(); const selectedTabIds = await getSelectedTabIds();
// Send 'grab_post' to the content script on the active tab let scrapeResults: ScrapeResults = new ScrapeResults();
const x = await browser.tabs.sendMessage(activeTabId, new BrowserCommand("grab_post")); for (const selectedTabId of selectedTabIds) {
// We need to create a new ScrapeResults object and fill it with our data, because the get_posts() // Send 'grab_post' to the content script on the active tabs
// method gets 'lost' when sent from the contentscript to the popup (it gets JSON.stringified and any prototype defines are lost there) const x = await browser.tabs.sendMessage(selectedTabId, new BrowserCommand("grab_post"));
const res = Object.assign(new ScrapeResults(), x); // We need to create a new ScrapeResults object and fill it with our data, because the get_posts()
// method gets 'lost' when sent from the contentscript to the popup (it gets JSON.stringified and any prototype defines are lost there)
const results: ScrapeResults = Object.assign(new ScrapeResults(), x);
console.dir(res); for (const result of results.results) {
const res = scrapeResults.results.find((r) => r.engine === result.engine);
if (res) res.posts.push(...result.posts);
else scrapeResults.results.push(result);
}
}
console.dir(scrapeResults);
// Clear current posts array // Clear current posts array
pop.posts.splice(0); pop.posts.splice(0);
for (const result of res.results) { for (const result of scrapeResults.results) {
for (const i in result.posts) { for (const i in result.posts) {
const vm = new ScrapedPostDetails(result.posts[i]); const vm = new ScrapedPostDetails(result.posts[i]);
vm.name = `[${result.engine}] Post ${parseInt(i) + 1}`; // parseInt() is required! const name = result.posts[i].name ?? `Post ${parseInt(i) + 1}`; // parseInt() is required!
vm.name = `[${result.engine}] ${name}`;
if (!cfg.value.addAllParsedTags) {
vm.tags.splice(0);
}
if (cfg.value.alwaysUploadAsContent && vm.name !== "[fallback] Upload as URL") {
vm.uploadMode = "content";
}
// Add current pageUrl to the source if either // Add current pageUrl to the source if either
// a. user has addPageUrlToSource set to true // a. user has addPageUrlToSource set to true
@ -116,6 +136,14 @@ async function grabPost() {
vm.instanceSpecificData[site.id] = {}; vm.instanceSpecificData[site.id] = {};
} }
// Remove ignored tags
// The complexity for this is quite bad but all the other ways I tried were even worse
vm.tags = vm.tags.filter((tag) =>
cfg.value.tagIgnores.every(
(ignoredTag) => tag.name != ignoredTag.names[0], // no getters after deserializing
),
);
pop.posts.push(vm); pop.posts.push(vm);
} }
} }
@ -132,7 +160,7 @@ async function grabPost() {
} }
if (cfg.value.fetchPostInfo) { if (cfg.value.fetchPostInfo) {
await fetchPostInfo(); await fetchPostsInfo();
} }
// Delayed call to findSimilar, as fetchPostInfo might change the post's contentUrl. // Delayed call to findSimilar, as fetchPostInfo might change the post's contentUrl.
@ -155,8 +183,18 @@ async function upload() {
} }
try { try {
const post: any = cloneDeep(pop.selectedPost); const post: ScrapedPostDetails = cloneDeep(pop.selectedPost)!;
const cmdData = new PostUploadCommandData(post, <SzuruSiteConfig>cloneDeep(selectedSite.value));
// uploadMode "content" requires a content token to work. So ensure it is set.
if (post.uploadMode === "content") {
await ensurePostHasContentToken(szuru.value!, post, cfg);
}
const cmdData = new PostUploadCommandData(
post,
<SzuruSiteConfig>cloneDeep(selectedSite.value),
cfg.value.sendUploadNotifications,
);
const cmd = new BrowserCommand("upload_post", cmdData); const cmd = new BrowserCommand("upload_post", cmdData);
await browser.runtime.sendMessage(cmd); await browser.runtime.sendMessage(cmd);
} catch (ex: any) { } catch (ex: any) {
@ -177,6 +215,15 @@ function removeTag(tag: TagDetails) {
} }
} }
function removePool(pool: PoolDetails) {
if (pop.selectedPost) {
const idx = pop.selectedPost.pools.indexOf(pool);
if (idx != -1) {
pop.selectedPost.pools.splice(idx, 1);
}
}
}
function getActiveSitePostUrl(postId: number): string { function getActiveSitePostUrl(postId: number): string {
if (!selectedSite.value) return ""; if (!selectedSite.value) return "";
return getUrl(selectedSite.value.domain, "post", postId.toString()); return getUrl(selectedSite.value.domain, "post", postId.toString());
@ -212,6 +259,15 @@ function addTag(tag: TagDetails) {
} }
} }
function addPool(pool: PoolDetails) {
if (pop.selectedPost) {
// Only add pool if it doesn't already exist
if (pool.name.length > 0 && pop.selectedPost.pools.find((x) => x.name == pool.name) == undefined) {
pop.selectedPost.pools.push(pool);
}
}
}
async function clickFindSimilar() { async function clickFindSimilar() {
if (pop.selectedPost) return await findSimilar(pop.selectedPost); if (pop.selectedPost) return await findSimilar(pop.selectedPost);
} }
@ -220,6 +276,10 @@ async function findSimilar(post: ScrapedPostDetails | undefined) {
if (!post || !szuru.value || !cfg.value.selectedSiteId) return; if (!post || !szuru.value || !cfg.value.selectedSiteId) return;
// TODO: This code might not work. // TODO: This code might not work.
// Why is toRaw used?
// I guess it could happen that the selectedInstance changes halfway during this function?
// And in that case toRaw would ensure we have the original selected instance (as it was at the start of this function).
// In theory this sounds correct, but idk if it is needed in practice.
const selectedInstance = toRaw(szuru.value); // Get current object, and not reactive. const selectedInstance = toRaw(szuru.value); // Get current object, and not reactive.
let instanceSpecificData = post.instanceSpecificData[cfg.value.selectedSiteId]; let instanceSpecificData = post.instanceSpecificData[cfg.value.selectedSiteId];
@ -229,23 +289,14 @@ async function findSimilar(post: ScrapedPostDetails | undefined) {
} }
// Don't load this again if it is already loaded. // Don't load this again if it is already loaded.
if (instanceSpecificData?.reverseSearchResult) return; if (instanceSpecificData.reverseSearchResult) return;
isSearchingForSimilarPosts.value++; isSearchingForSimilarPosts.value++;
try { try {
let res: ImageSearchResult | undefined; await ensurePostHasContentToken(selectedInstance, post, cfg);
if (cfg.value.useContentTokens) { const res = await selectedInstance.reverseSearchToken(instanceSpecificData.contentToken!);
let tmpRes = await selectedInstance.uploadTempFile(post.contentUrl);
// TODO: Error handling?
// Save contentToken in PostViewModel so that we can reuse it when creating/uploading the post.
instanceSpecificData.contentToken = tmpRes.token;
res = await selectedInstance.reverseSearchToken(tmpRes.token);
} else {
res = await selectedInstance.reverseSearch(post.contentUrl);
}
instanceSpecificData.reverseSearchResult = { instanceSpecificData.reverseSearchResult = {
exactPostId: res.exactPost?.id, exactPostId: res.exactPost?.id,
@ -272,43 +323,66 @@ async function loadTagCounts() {
// Not the best code, but it works I guess? // Not the best code, but it works I guess?
if (resp) { if (resp) {
for (let post of pop.posts) for (let post of pop.posts)
for (let tag of resp.results) for (let tag of resp.results) {
for (let postTag of post.tags) const postTag = post.tags.find((postTag) => tag.names.includes(postTag.name));
if (postTag.name == tag.names[0]) { if (postTag) postTag.usages = tag.usages;
postTag.usages = tag.usages; }
break;
}
} }
} }
} }
async function fetchPostInfo() { async function updatePostWithRemoteInfo(post: ScrapedPostDetails, contentUrl: string) {
// We are missing cookies/etc which means that the request might fail.
// If you want access to the cookies/session/etc then you need to execute this code inside the content script.
try {
// This request follows redirects.
const res = await fetch(contentUrl, { method: "HEAD" });
const size = res.headers.get("Content-Length");
const type = res.headers.get("Content-Type");
if (type) {
if (type.indexOf("text/html") != -1) {
// If we get a HTML page back it usually means that the request failed.
// Not all sites (e.g. e-hentai) reply with a 403.
throw new Error(
"Received a text/html content type. This probably means that we don't have permission to access the resource.",
);
}
const [_main, sub] = type.split("/");
if (sub) post.contentSubType = sub.toUpperCase();
}
// This should be after the type check, because the type check also checks whether the response we get is valid/unsable.
if (size) post.contentSize = parseInt(size);
// Update url if it changes. The url can change when:
// a. the extraContentUrl was successfully loaded
// b. because of redirects
if (res.url != post.contentUrl) {
// The developer needs to make sure that the remote server can load this URL if `post.uploadMode == 'url'`!
console.log(`Updating post.contentUrl to '${res.url}'`);
post.contentUrl = res.url;
}
return true;
} catch (ex) {
console.error(ex);
return false;
}
}
async function fetchPostsInfo() {
for (const post of pop.posts) { for (const post of pop.posts) {
if (!post.contentSize || post.extraContentUrl) { if (!post.contentSize || post.extraContentUrl) {
// We are missing cookies/etc which means that the request might fail. let ok = false;
// If you want access to the cookies/session/etc then you need to execute this code inside the content script. if (post.extraContentUrl) {
try { // Prioritize info from extraContentUrl.
const contentUrl = post.extraContentUrl ?? post.contentUrl; ok = await updatePostWithRemoteInfo(post, post.extraContentUrl);
}
// TODO: Check whether we need to call this in the background page, or if it is fine to call it from the popup. if (!ok) {
const res = await fetch(contentUrl, { method: "HEAD" }); // Fall back to normal contentUrl if we can't get the data from the extraContentUrl.
const size = res.headers.get("Content-Length"); await updatePostWithRemoteInfo(post, post.contentUrl);
const type = res.headers.get("Content-Type");
if (size) post.contentSize = parseInt(size);
if (type) {
const [_main, sub] = type.split("/");
if (sub) post.contentSubType = sub.toUpperCase();
}
// Resolve extraContentUrl redirects.
if (post.extraContentUrl && res.url != post.contentUrl) {
post.contentUrl = res.url;
}
} catch (ex) {
// TODO: Maybe display an error in the UI.
console.error(ex);
} }
} }
} }
@ -320,7 +394,8 @@ function getUpdatedTagsText(count: number) {
} }
function onResolutionLoaded(res: any) { function onResolutionLoaded(res: any) {
if (pop.selectedPost && !pop.selectedPost.resolution) { // This no longer checks for `!pop.selectedPost.resolution` because the resolution can change if the contentUrl is updated.
if (pop.selectedPost) {
pop.selectedPost.resolution = res; pop.selectedPost.resolution = res;
} }
} }
@ -337,7 +412,7 @@ useDark();
<template> <template>
<div class="popup-messages"> <div class="popup-messages">
<div class="messages"> <div class="messages">
<!-- <!--
Error messages Error messages
--> -->
@ -371,7 +446,10 @@ useDark();
</div> </div>
</div> </div>
<!-- Only show error when it's not undefined and not empty. --> <!--
Only show error when it's not undefined and not empty.
TODO: Maybe remove this in favor of genericError?
-->
<div v-if="instanceSpecificData?.uploadState?.error?.length" class="bg-danger"> <div v-if="instanceSpecificData?.uploadState?.error?.length" class="bg-danger">
<span>Couldn't upload post. {{ instanceSpecificData.uploadState.error }}</span> <span>Couldn't upload post. {{ instanceSpecificData.uploadState.error }}</span>
</div> </div>
@ -502,13 +580,13 @@ useDark();
</div> </div>
</div> </div>
<div class="section-row"> <div v-if="cfg.popup.showSource" class="section-row">
<span class="section-label">Source</span> <span class="section-label">Source</span>
<textarea v-model="pop.selectedPost.source"></textarea> <textarea v-model="pop.selectedPost.source"></textarea>
</div> </div>
</PopupSection> </PopupSection>
<PopupSection header="Tags"> <PopupSection header="Tags" toggleable v-model="cfg.popup.expandTags">
<div class="section-row"> <div class="section-row">
<TagInput :szuru="szuru" @add-tag="addTag" /> <TagInput :szuru="szuru" @add-tag="addTag" />
</div> </div>
@ -523,7 +601,22 @@ useDark();
</div> </div>
</PopupSection> </PopupSection>
<div class="popup-section"> <PopupSection v-if="cfg.popup.showPools" header="Pools" toggleable v-model="cfg.popup.expandPools">
<div class="section-row">
<PoolInput :szuru="szuru" @add-pool="addPool" />
</div>
<div class="section-row">
<CompactPools
:pools="pop.selectedPost.pools"
:show-remove-pool="true"
show-post-count
@remove-pool="removePool"
/>
</div>
</PopupSection>
<div v-if="cfg.popup.showInstancePicker" class="popup-section">
<div class="section-row"> <div class="section-row">
<select v-model="cfg.selectedSiteId"> <select v-model="cfg.selectedSiteId">
<option v-for="site in cfg.sites" :key="site.id" :value="site.id"> <option v-for="site in cfg.sites" :key="site.id" :value="site.id">
@ -562,7 +655,7 @@ useDark();
</div> </div>
</div> </div>
<div v-else class="p3 flex items-center gap-3"> <div v-else class="p-3 flex items-center gap-3">
<span>No content found</span> <span>No content found</span>
<font-awesome-icon icon="fa-solid fa-cog" class="cursor-pointer" @click="openOptionsPage" /> <font-awesome-icon icon="fa-solid fa-cog" class="cursor-pointer" @click="openOptionsPage" />
</div> </div>

View File

@ -1,13 +1,22 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import deepMerge from "deepmerge"; import deepMerge from "deepmerge";
import { SzuruSiteConfig } from "~/config"; import {
import type { ScrapedPostDetails, SetPostUploadInfoData } from "~/models"; type TagDetails,
getDefaultTagCategories,
type ScrapedPostDetails,
type SetPostUploadInfoData,
type SzuruSiteConfig,
type TagCategoryColor,
} from "~/models";
import { useStorageLocal } from "~/composables/useStorageLocal"; import { useStorageLocal } from "~/composables/useStorageLocal";
export const cfg = useStorageLocal( export const cfg = useStorageLocal(
"config", "config",
{ {
version: 0,
addPageUrlToSource: true, addPageUrlToSource: true,
alwaysUploadAsContent: false,
sendUploadNotifications: false,
autoSearchSimilar: false, autoSearchSimilar: false,
loadTagCounts: true, loadTagCounts: true,
fetchPostInfo: true, fetchPostInfo: true,
@ -15,6 +24,7 @@ export const cfg = useStorageLocal(
sites: [] as Array<SzuruSiteConfig>, sites: [] as Array<SzuruSiteConfig>,
selectedSiteId: undefined as string | undefined, selectedSiteId: undefined as string | undefined,
addTagImplications: true, addTagImplications: true,
addAllParsedTags: true,
merge: { merge: {
expandOptions: true, expandOptions: true,
expandExistingTags: false, expandExistingTags: false,
@ -23,10 +33,41 @@ export const cfg = useStorageLocal(
appendSource: true, appendSource: true,
mergeSafety: true, mergeSafety: true,
}, },
popup: {
expandTags: true,
expandPools: false,
showSource: true,
showPools: true,
showInstancePicker: true,
},
tagCategories: [] as Array<TagCategoryColor>,
tagIgnores: [] as Array<TagDetails>,
}, },
{ {
mergeDefaults: (storageValue, defaults) => deepMerge(defaults, storageValue), mergeDefaults(storageValue, defaults) {
} const cfg = deepMerge(defaults, storageValue);
const oldVersion = cfg.version;
// Crappy config migration.
switch (cfg.version) {
case 0:
cfg.version++;
// Don't clear the existing tagCategories and don't add duplicates.
for (const cat of getDefaultTagCategories()) {
if (!cfg.tagCategories.find((x) => x.name == cat.name)) {
cfg.tagCategories.push(cat);
}
}
}
if (oldVersion != cfg.version) {
console.log(`Migrated config from version ${oldVersion} to ${cfg.version}`);
}
return cfg;
},
},
); );
export const usePopupStore = defineStore("popup", { export const usePopupStore = defineStore("popup", {

View File

@ -1,56 +1,21 @@
@use "sass:color"; @use "sass:color";
@use "basscss/css/basscss-cp.css"; @use "primeflex/primeflex.scss";
:root {
--space-1: 0.25rem;
--space-2: 0.5rem;
--space-3: 1rem;
--space-4: 2rem;
}
.flex-fit {
flex: 0 0 100%;
}
.gap-1 {
gap: var(--space-1);
}
.gap-2 {
gap: var(--space-2);
}
.gap-3 {
gap: var(--space-3);
}
.gap-4 {
gap: var(--space-4);
}
.gapx-1 {
column-gap: var(--space-1);
}
.gapx-2 {
column-gap: var(--space-2);
}
.gapx-3 {
column-gap: var(--space-3);
}
.gapx-4 {
column-gap: var(--space-4);
}
/* open-sans-regular - latin */ /* open-sans-regular - latin */
@font-face { @font-face {
font-family: "Open Sans"; font-family: "Open Sans";
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local(""), url("/assets/open-sans-v34-latin-regular.woff2") format("woff2"); src:
local(""),
url("/assets/open-sans-v34-latin-regular.woff2") format("woff2");
}
*,
*:before,
*:after {
box-sizing: border-box;
} }
body { body {
@ -77,6 +42,7 @@ $danger-color-dark: color.scale($danger-color, $lightness: -50%);
--section-header-fg-color: #4c4c4c; --section-header-fg-color: #4c4c4c;
--section-header-bg-color: #eee; --section-header-bg-color: #eee;
--text-color: #111; --text-color: #111;
--tab-color: rgba(0, 0, 0, 0.06);
} }
html.dark { html.dark {
@ -89,6 +55,7 @@ html.dark {
--section-header-fg-color: #d9d9d9; --section-header-fg-color: #d9d9d9;
--section-header-bg-color: #272727; --section-header-bg-color: #272727;
--text-color: #e6e6e6; --text-color: #e6e6e6;
--tab-color: rgba(255, 255, 255, 0.06);
color: var(--text-color); color: var(--text-color);
background-color: var(--bg-main-color); background-color: var(--bg-main-color);
color-scheme: dark; color-scheme: dark;
@ -129,10 +96,10 @@ input[type="text"],
select { select {
color: var(--text-color); color: var(--text-color);
background-color: var(--bg-secondary-color); background-color: var(--bg-secondary-color);
border: 1px solid var(--border-color); border: 2px solid var(--border-color);
padding: 0.2em 0.3em; padding: 0.2em 0.3em;
box-sizing: border-box; // box-sizing: border-box;
width: 100%; width: 100%;
@ -148,7 +115,7 @@ input[type="radio"] {
textarea { textarea {
color: var(--text-color); color: var(--text-color);
background-color: var(--bg-secondary-color); background-color: var(--bg-secondary-color);
border: 1px solid var(--border-color); border: 2px solid var(--border-color);
width: 100%; width: 100%;
white-space: pre; white-space: pre;
overflow-wrap: normal; overflow-wrap: normal;
@ -158,7 +125,7 @@ textarea {
&:focus { &:focus {
outline: var(--primary-color) solid 2px; outline: var(--primary-color) solid 2px;
box-sizing: content-box; // box-sizing: content-box;
} }
} }
@ -171,6 +138,7 @@ img {
display: flex; display: flex;
} }
// DEPRECATED: Replace with primeflex w-full
.full { .full {
width: 100%; width: 100%;
} }
@ -181,7 +149,8 @@ ul.compact {
display: inline; display: inline;
} }
.compact-tags { .compact-tags,
.compact-pools {
list-style-type: none; list-style-type: none;
padding: 0; padding: 0;
display: inline; display: inline;
@ -198,30 +167,6 @@ ul.compact {
color: var(--primary-color); color: var(--primary-color);
} }
.tag-copyright {
color: rgb(170, 0, 170);
}
.tag-character {
color: rgb(0, 170, 0);
}
.tag-artist {
color: rgb(170, 0, 0);
}
.tag-meta {
color: rgb(255, 128, 0);
}
.tag-species {
color: rgb(17, 14, 247);
}
.tag-lore {
color: rgb(48, 48, 48);
}
.remove-tag { .remove-tag {
color: var(--secondary-text); color: var(--secondary-text);
} }
@ -283,3 +228,49 @@ a.remove-tag {
.cursor-pointer { .cursor-pointer {
cursor: pointer; cursor: pointer;
} }
.popup-section {
margin: 10px;
}
.section-header {
height: 30px;
padding: 0 6px 0 10px;
background-color: var(--section-header-bg-color);
display: flex;
justify-content: space-between;
align-items: center;
> span {
font-size: 1.2em;
vertical-align: middle;
color: var(--section-header-fg-color);
}
&.toggleable {
cursor: pointer;
}
}
.section-row {
margin: 10px 5px 0;
}
.section-label {
display: block;
margin: 0 0 5px 0;
}
.section-block {
display: block;
}
.color-primary {
color: var(--primary-color);
}
.separated-content > * + * {
padding-top: 1rem;
margin-top: 1.5rem;
border-top: 3px solid #333;
}

View File

@ -17,10 +17,6 @@
} }
} }
.popup-section {
margin: 10px;
}
video { video {
width: 100%; width: 100%;
} }
@ -37,35 +33,3 @@ label {
margin: 3px 3px 0 0; margin: 3px 3px 0 0;
} }
} }
.section-header {
height: 30px;
padding: 0 6px 0 10px;
background-color: var(--section-header-bg-color);
display: flex;
justify-content: space-between;
align-items: center;
> span {
font-size: 1.2em;
vertical-align: middle;
color: var(--section-header-fg-color);
}
&.toggleable {
cursor: pointer;
}
}
.section-row {
margin: 10px 5px 0;
}
.section-label {
display: block;
margin: 0 0 5px 0;
}
.section-block {
display: block;
}

27
src/styles/primevue.scss Normal file
View File

@ -0,0 +1,27 @@
.p-tabview {
.p-tabview-nav {
margin: 1em 0;
}
.p-tabview-header {
span {
padding: 0 1.2em;
line-height: 2.3em;
}
&.p-highlight {
background-color: var(--tab-color);
}
}
}
.p-datatable {
margin: -0.4em;
.p-datatable-table {
th,
td {
padding: 0.4em;
}
}
}

View File

@ -1,7 +1,7 @@
import { describe, expect, it } from 'vitest'; import { describe, expect, it } from "vitest";
describe('Demo', () => { describe("Demo", () => {
it('should work', () => { it("should work", () => {
expect(1 + 1).toBe(2); expect(1 + 1).toBe(2);
}); });
}); });

View File

@ -1,6 +1,7 @@
import byteSize from "byte-size"; import byteSize from "byte-size";
import { MicroUser, Post } from "./api/models"; import { MicroUser, Post } from "./api/models";
import { ScrapedPostDetails, TagDetails } from "./models"; import { ScrapedPostDetails, TagDetails } from "./models";
import SzurubooruApi from "./api";
export function getUrl(root: string, ...parts: string[]): string { export function getUrl(root: string, ...parts: string[]): string {
let url = root.replace(/\/+$/, ""); let url = root.replace(/\/+$/, "");
@ -102,3 +103,28 @@ export function getPostInfoSummary(post: ScrapedPostDetails) {
} }
return parts.join(" / "); return parts.join(" / ");
} }
export async function ensurePostHasContentToken(selectedInstance: SzurubooruApi, post: ScrapedPostDetails, cfg: any) {
if (!selectedInstance || !cfg.value.selectedSiteId) return;
const instanceSpecificData = post.instanceSpecificData[cfg.value.selectedSiteId];
if (!instanceSpecificData) {
console.error("instanceSpecificData is undefined. This should never happen!");
return;
}
if (instanceSpecificData.contentToken) {
console.log("[ensurePostHasContentToken] contentToken is already set.");
return;
}
try {
const tmpRes = await selectedInstance.uploadTempFile(post.contentUrl, post.uploadMode);
// Save contentToken in PostViewModel so that we can reuse it when creating/uploading the post.
instanceSpecificData.contentToken = tmpRes.token;
} catch (ex) {
instanceSpecificData.genericError = "Couldn't upload content. " + getErrorMessage(ex);
throw ex;
}
}

View File

@ -3,10 +3,7 @@
"baseUrl": ".", "baseUrl": ".",
"module": "ESNext", "module": "ESNext",
"target": "es2016", "target": "es2016",
"lib": [ "lib": ["DOM", "ESNext"],
"DOM",
"ESNext"
],
"strict": true, "strict": true,
"esModuleInterop": true, "esModuleInterop": true,
"incremental": false, "incremental": false,
@ -16,17 +13,10 @@
"resolveJsonModule": true, "resolveJsonModule": true,
"noUnusedLocals": true, "noUnusedLocals": true,
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,
"types": [ "types": ["vite/client"],
"vite/client"
],
"paths": { "paths": {
"~/*": [ "~/*": ["src/*"]
"src/*"
]
} }
}, },
"exclude": [ "exclude": ["dist", "node_modules"]
"dist",
"node_modules"
]
} }

12
updates.json Normal file
View File

@ -0,0 +1,12 @@
{
"addons": {
"suzuruchrome@goblincave": {
"updates": [
{
"version": "0.1.4",
"update_link": "https://gitea.goblincave.synology.me/Nes/SzuruChrome/releases/download/mod-v0.1.X/SzuruChrome_v0.1.4.xpi"
}
]
}
}
}