Compare commits
No commits in common. "master" and "v0.13.1" have entirely different histories.
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 33 KiB |
70
package.json
70
package.json
|
|
@ -27,55 +27,55 @@
|
|||
"pretty": "prettier -w ."
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.19.0",
|
||||
"byte-size": "^8.2.1",
|
||||
"axios": "^1.6.3",
|
||||
"byte-size": "^8.1.1",
|
||||
"deepmerge": "^4.3.1",
|
||||
"lodash": "^4.18.1",
|
||||
"markdown-it": "^14.3.0",
|
||||
"neo-scraper": "^0.11.1",
|
||||
"lodash": "^4.17.21",
|
||||
"markdown-it": "^14.0.0",
|
||||
"neo-scraper": "^0.10.1",
|
||||
"normalize.css": "^8.0.1",
|
||||
"pinia": "^2.3.1",
|
||||
"pinia": "^2.1.7",
|
||||
"primeflex": "^3.3.1",
|
||||
"primevue": "3.45.0",
|
||||
"vue-router": "^4.6.4"
|
||||
"primevue": "^3.45.0",
|
||||
"vue-router": "^4.2.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ffflorian/jszip-cli": "^3.16.5",
|
||||
"@fortawesome/fontawesome-svg-core": "^6.7.2",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.7.2",
|
||||
"@fortawesome/vue-fontawesome": "^3.3.3",
|
||||
"@ffflorian/jszip-cli": "^3.5.8",
|
||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||
"@fortawesome/vue-fontawesome": "^3.0.5",
|
||||
"@types/byte-size": "^8.1.2",
|
||||
"@types/fs-extra": "^11.0.4",
|
||||
"@types/lodash": "^4.17.25",
|
||||
"@types/markdown-it": "^13.0.9",
|
||||
"@types/node": "^20.19.43",
|
||||
"@types/lodash": "^4.14.202",
|
||||
"@types/markdown-it": "^13.0.7",
|
||||
"@types/node": "^20.10.5",
|
||||
"@types/webextension-polyfill": "^0.10.7",
|
||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
||||
"@vitejs/plugin-vue": "^5.2.4",
|
||||
"@vue/compiler-sfc": "^3.5.41",
|
||||
"@vue/test-utils": "^2.4.11",
|
||||
"@vueuse/core": "^10.11.1",
|
||||
"chokidar": "^3.6.0",
|
||||
"@typescript-eslint/eslint-plugin": "^6.16.0",
|
||||
"@vitejs/plugin-vue": "^5.0.1",
|
||||
"@vue/compiler-sfc": "^3.4.0",
|
||||
"@vue/test-utils": "^2.4.3",
|
||||
"@vueuse/core": "^10.7.1",
|
||||
"chokidar": "^3.5.3",
|
||||
"cross-env": "^7.0.3",
|
||||
"crx": "^5.0.1",
|
||||
"eslint": "^8.57.1",
|
||||
"eslint-plugin-vue": "^9.33.0",
|
||||
"esno": "^4.8.0",
|
||||
"fs-extra": "^11.4.0",
|
||||
"jsdom": "^23.2.0",
|
||||
"eslint": "^8.56.0",
|
||||
"eslint-plugin-vue": "^9.19.2",
|
||||
"esno": "^4.0.0",
|
||||
"fs-extra": "^11.2.0",
|
||||
"jsdom": "^23.0.1",
|
||||
"kolorist": "^1.8.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^3.9.6",
|
||||
"prettier": "^3.1.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"sass": "^1.102.0",
|
||||
"typescript": "^5.9.3",
|
||||
"unplugin-auto-import": "^0.17.8",
|
||||
"sass": "^1.69.6",
|
||||
"typescript": "^5.3.3",
|
||||
"unplugin-auto-import": "^0.17.3",
|
||||
"unplugin-vue-components": "^0.26.0",
|
||||
"vite": "^5.4.21",
|
||||
"vitest": "^1.6.1",
|
||||
"vue": "^3.5.41",
|
||||
"vue-eslint-parser": "^9.4.3",
|
||||
"web-ext": "^8.10.0",
|
||||
"vite": "^5.0.10",
|
||||
"vitest": "^1.1.0",
|
||||
"vue": "^3.4.0",
|
||||
"vue-eslint-parser": "^9.3.2",
|
||||
"web-ext": "^8.4.0",
|
||||
"webextension-polyfill": "^0.10.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
5010
pnpm-lock.yaml
5010
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
import { encodeTagName, getErrorMessage, getUrl } from "~/utils";
|
||||
import { encodeTagName, getErrorMessage } from "~/utils";
|
||||
import {
|
||||
BrowserCommand,
|
||||
PostUploadCommandData,
|
||||
|
|
@ -19,13 +19,6 @@ if (import.meta.hot) {
|
|||
import("./contentScriptHMR");
|
||||
}
|
||||
|
||||
browser.notifications.onClicked.addListener((url) => {
|
||||
if (url) {
|
||||
browser.tabs.create({ url });
|
||||
browser.notifications.clear(url);
|
||||
}
|
||||
});
|
||||
|
||||
async function uploadPost(data: PostUploadCommandData) {
|
||||
const info: PostUploadInfo = {
|
||||
state: "uploading",
|
||||
|
|
@ -124,16 +117,6 @@ async function uploadPost(data: PostUploadCommandData) {
|
|||
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) {
|
||||
console.error(ex);
|
||||
if (ex.name && ex.name == "PostAlreadyUploadedError") {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ export async function getManifest() {
|
|||
page: "./dist/background/index.html",
|
||||
// persistent: false,
|
||||
},
|
||||
permissions: ["storage", "activeTab", "webRequest", "webRequestBlocking", "notifications", "<all_urls>"],
|
||||
permissions: ["storage", "activeTab", "webRequest", "webRequestBlocking", "<all_urls>"],
|
||||
content_scripts: [
|
||||
{
|
||||
matches: ["http://*/*", "https://*/*"],
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@ export class PostUploadCommandData {
|
|||
constructor(
|
||||
public readonly post: ScrapedPostDetails,
|
||||
public readonly selectedSite: SzuruSiteConfig,
|
||||
public readonly sendNotifications: boolean,
|
||||
) { }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import TabView from "primevue/tabview";
|
|||
import TabPanel from "primevue/tabpanel";
|
||||
import DataTable from "primevue/datatable";
|
||||
import Column from "primevue/column";
|
||||
import { TagDetails, SzuruSiteConfig, TagCategoryColor, getDefaultTagCategories } from "~/models";
|
||||
import { SzuruSiteConfig, TagCategoryColor, getDefaultTagCategories } from "~/models";
|
||||
import SzurubooruApi from "~/api";
|
||||
|
||||
type StatusType = "success" | "error" | "quiet";
|
||||
|
|
@ -102,14 +102,6 @@ async function importTagCategoriesFromInstance() {
|
|||
}
|
||||
}
|
||||
|
||||
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));
|
||||
|
|
@ -152,17 +144,9 @@ wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
|
|||
<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.
|
||||
This will always upload the image content directly, instead of
|
||||
as an URL
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
|
@ -276,7 +260,6 @@ wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
|
|||
</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">
|
||||
|
|
@ -317,29 +300,9 @@ wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
|
|||
|
||||
<!-- 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: Tag ignore list -->
|
||||
|
||||
<!-- TODO: Category ignore list -->
|
||||
</div>
|
||||
</TabPanel>
|
||||
|
||||
<!-- <TabPanel header="About">
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ async function mergeChanges() {
|
|||
if (imageToKeep.value == "new") {
|
||||
// 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);
|
||||
ensurePostHasContentToken(szuru, scrapedPost, cfg);
|
||||
req.contentToken = scrapedPost.instanceSpecificData[cfg.value.selectedSiteId!].contentToken!;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -73,43 +73,32 @@ function openOptionsPage() {
|
|||
browser.runtime.openOptionsPage();
|
||||
}
|
||||
|
||||
async function getSelectedTabIds(): Promise<number[]> {
|
||||
const selectedTabs = await browser.tabs.query({
|
||||
highlighted: true,
|
||||
async function getActiveTabId(): Promise<number> {
|
||||
const activeTabs = await browser.tabs.query({
|
||||
active: true,
|
||||
currentWindow: true,
|
||||
});
|
||||
|
||||
if (selectedTabs.length > 0 && selectedTabs[0].id) {
|
||||
return selectedTabs.filter((tab) => tab.id).map((tab) => tab.id as number);
|
||||
}
|
||||
if (activeTabs.length > 0 && activeTabs[0].id) return activeTabs[0].id;
|
||||
throw new Error("No active tab.");
|
||||
}
|
||||
|
||||
async function grabPost() {
|
||||
// Get active tab
|
||||
const selectedTabIds = await getSelectedTabIds();
|
||||
const activeTabId = await getActiveTabId();
|
||||
|
||||
let scrapeResults: ScrapeResults = new ScrapeResults();
|
||||
for (const selectedTabId of selectedTabIds) {
|
||||
// Send 'grab_post' to the content script on the active tabs
|
||||
const x = await browser.tabs.sendMessage(selectedTabId, new BrowserCommand("grab_post"));
|
||||
// Send 'grab_post' to the content script on the active tab
|
||||
const x = await browser.tabs.sendMessage(activeTabId, new BrowserCommand("grab_post"));
|
||||
// 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);
|
||||
const res: ScrapeResults = Object.assign(new ScrapeResults(), x);
|
||||
|
||||
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);
|
||||
console.dir(res);
|
||||
|
||||
// Clear current posts array
|
||||
pop.posts.splice(0);
|
||||
|
||||
for (const result of scrapeResults.results) {
|
||||
for (const result of res.results) {
|
||||
for (const i in result.posts) {
|
||||
const vm = new ScrapedPostDetails(result.posts[i]);
|
||||
const name = result.posts[i].name ?? `Post ${parseInt(i) + 1}`; // parseInt() is required!
|
||||
|
|
@ -136,14 +125,6 @@ async function grabPost() {
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
|
@ -190,11 +171,7 @@ async function upload() {
|
|||
await ensurePostHasContentToken(szuru.value!, post, cfg);
|
||||
}
|
||||
|
||||
const cmdData = new PostUploadCommandData(
|
||||
post,
|
||||
<SzuruSiteConfig>cloneDeep(selectedSite.value),
|
||||
cfg.value.sendUploadNotifications,
|
||||
);
|
||||
const cmdData = new PostUploadCommandData(post, <SzuruSiteConfig>cloneDeep(selectedSite.value));
|
||||
const cmd = new BrowserCommand("upload_post", cmdData);
|
||||
await browser.runtime.sendMessage(cmd);
|
||||
} catch (ex: any) {
|
||||
|
|
@ -324,8 +301,9 @@ async function loadTagCounts() {
|
|||
if (resp) {
|
||||
for (let post of pop.posts)
|
||||
for (let tag of resp.results) {
|
||||
const postTag = post.tags.find((postTag) => tag.names.includes(postTag.name));
|
||||
if (postTag) postTag.usages = tag.usages;
|
||||
// @ts-expect-error .find() can't return undefined because the resp.results list can only contain
|
||||
// the tags which we requested. And we only request the tags which are already set on the post.
|
||||
post.tags.find((postTag) => tag.names.includes(postTag.name)).usages = tag.usages;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import { defineStore } from "pinia";
|
||||
import deepMerge from "deepmerge";
|
||||
import {
|
||||
type TagDetails,
|
||||
getDefaultTagCategories,
|
||||
type ScrapedPostDetails,
|
||||
type SetPostUploadInfoData,
|
||||
|
|
@ -16,7 +15,6 @@ export const cfg = useStorageLocal(
|
|||
version: 0,
|
||||
addPageUrlToSource: true,
|
||||
alwaysUploadAsContent: false,
|
||||
sendUploadNotifications: false,
|
||||
autoSearchSimilar: false,
|
||||
loadTagCounts: true,
|
||||
fetchPostInfo: true,
|
||||
|
|
@ -41,7 +39,6 @@ export const cfg = useStorageLocal(
|
|||
showInstancePicker: true,
|
||||
},
|
||||
tagCategories: [] as Array<TagCategoryColor>,
|
||||
tagIgnores: [] as Array<TagDetails>,
|
||||
},
|
||||
{
|
||||
mergeDefaults(storageValue, defaults) {
|
||||
|
|
|
|||
|
|
@ -268,9 +268,3 @@ a.remove-tag {
|
|||
.color-primary {
|
||||
color: var(--primary-color);
|
||||
}
|
||||
|
||||
.separated-content > * + * {
|
||||
padding-top: 1rem;
|
||||
margin-top: 1.5rem;
|
||||
border-top: 3px solid #333;
|
||||
}
|
||||
|
|
|
|||
12
updates.json
12
updates.json
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
"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"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue