bepis()}
+ on:click={bepis}
+ on:auxclick={bepis}
on:mouseover={hoverStart}
on:mouseout={hoverStop}
on:mousemove={hoverUpdate}
diff --git a/src/EyeButton.svelte b/src/EyeButton.svelte
index 8dc972e..4b9164e 100644
--- a/src/EyeButton.svelte
+++ b/src/EyeButton.svelte
@@ -1,5 +1,6 @@
+
+{#if $settings.sh}
+
+{/if}
+
+
diff --git a/src/global.css b/src/global.css
index 6d58afa..fea18d4 100644
--- a/src/global.css
+++ b/src/global.css
@@ -61,4 +61,4 @@ div.hasext .catalog-host img {
.fileThumb.filehost {
margin-left: 0 !important;
-}
\ No newline at end of file
+}
diff --git a/src/main.ts b/src/main.ts
index 702022a..f656bd1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,5 @@
import { Buffer } from "buffer";
-import { settings } from "./stores";
+import { appState, settings } from "./stores";
import globalCss from './global.css';
import png from "./png";
@@ -10,6 +10,7 @@ import thirdeye from "./thirdeye";
import { GM_fetch, GM_head, headerStringToObject } from "./requests";
import App from "./App.svelte";
+import ScrollHighlighter from "./ScrollHighlighter.svelte";
import SettingsButton from './SettingsButton.svelte';
import Embedding from './Embedding.svelte';
import EyeButton from './EyeButton.svelte';
@@ -59,12 +60,16 @@ async function* streamRemote(url: string, chunkSize = 16 * 1024, fetchRestOnNonC
}
type EmbeddedFileWithPreview = {
+ page?: string; // can be a booru page
+ source?: string; // can be like a twitter post this was posted in originally
thumbnail: Buffer;
filename: string;
data: (lisn?: EventTarget) => Promise
;
};
type EmbeddedFileWithoutPreview = {
+ page: undefined;
+ source: undefined;
thumbnail: undefined;
filename: string;
data: Buffer;
@@ -152,7 +157,7 @@ const processPost = async (post: HTMLDivElement) => {
eyecont.innerHTML = '';
}
const id = ~~(Math.random() * 20000000);
- new Embedding({
+ const emb = new Embedding({
target: imgcont,
props: {
file: res,
@@ -163,6 +168,7 @@ const processPost = async (post: HTMLDivElement) => {
target: eyecont,
props: {
file: res,
+ inst: emb,
id: '' + id
}
});
@@ -232,6 +238,11 @@ const startup = async () => {
const appInstance = new App({ target: appHost });
document.body.append(appHost);
+ const scrollHost = textToElement(``);
+ new ScrollHighlighter({ target: scrollHost });
+ document.body.append(scrollHost);
+
+ appState.set({isCatalog: !!document.querySelector('.catalog-small')});
await Promise.all(posts.map(e => processPost(e as any)));
};
diff --git a/src/stores.ts b/src/stores.ts
index f0853eb..62f1a1d 100644
--- a/src/stores.ts
+++ b/src/stores.ts
@@ -15,6 +15,9 @@ export const settings = writable(localLoad('settings', {
xpi: false,
te: false,
eye: false,
+ ca: false,
+ pre: false,
+ prev: false,
blacklist: ['guro', 'scat', 'ryona', 'gore'],
sources: ['gelbooru.com',
'yande.re',
@@ -24,6 +27,14 @@ export const settings = writable(localLoad('settings', {
'lolibooru.moe']
}));
+export const appState = writable({
+ isCatalog: false
+});
+
+appState.subscribe(v => {
+ console.log(v);
+});
+
settings.subscribe(newVal => {
localSet('settings', newVal);
});
diff --git a/src/thirdeye.ts b/src/thirdeye.ts
index 4535365..d84bbe5 100644
--- a/src/thirdeye.ts
+++ b/src/thirdeye.ts
@@ -9,6 +9,8 @@ export type Booru = {
};
export type BooruMatch = {
+ source?: string;
+ page?: string;
tags: string[];
full_url: string;
preview_url: string;
@@ -17,25 +19,29 @@ export type BooruMatch = {
type tran = (a: any) => BooruMatch[];
-const gelquirk: tran = a =>
+const gelquirk: (s: string) => tran = prefix => (a =>
(a.post || a).map((e: any) => ({
ext: e.image.substr(e.image.indexOf('.') + 1),
full_url: e.file_url,
+ source: e.source,
+ page: `${prefix}${e.id}`,
preview_url: e.preview_url,
tags: e.tags.split(' ')
- } as BooruMatch)) || [];
+ } as BooruMatch)) || []);
export const boorus: Booru[] = [
{
domain: 'gelbooru.com',
endpoint: '/index.php?page=dapi&s=post&q=index&json=1&tags=md5:',
- quirks: gelquirk
+ quirks: gelquirk("https://gelbooru.com/index.php?page=post&s=view&id=")
},
{
domain: 'yande.re',
endpoint: '/post.json?tags=md5:',
quirks: a =>
a.map((e: any) => ({
+ source: e.source,
+ page: `https://yande.re/post/show/${e.id}`,
ext: e.file_ext,
full_url: e.file_url,
preview_url: e.preview_url,
@@ -47,6 +53,9 @@ export const boorus: Booru[] = [
endpoint: '/posts/keyset?tags=md5:',
quirks: a => a.data ?
a.data.map((e: any) => ({
+ source: e.source,
+ // api cannot differenciate between idol and chan?
+ page: `https://chan.sankakucomplex.com/post/show/${e.id}`,
ext: e.file_type.substr(e.file_type.indexOf('/') + 1),
full_url: e.file_url,
preview_url: e.preview_url,
@@ -56,13 +65,16 @@ export const boorus: Booru[] = [
{
domain: 'api.rule34.xxx',
endpoint: '/index.php?page=dapi&s=post&q=index&json=1&tags=md5:',
- quirks: gelquirk
+ // note: rule34 do not seem to give source in their API
+ quirks: gelquirk("https://rule34.xxx/index.php?page=post&s=view&id=")
},
{
domain: 'danbooru.donmai.us',
endpoint: '/posts.json?tags=md5:',
quirks: a =>
a.map((e: any) => ({
+ source: e.source,
+ page: `https://danbooru.donmai.us/posts/${e.id}`,
ext: e.file_ext,
full_url: e.file_url,
preview_url: e.preview_url,
@@ -74,6 +86,8 @@ export const boorus: Booru[] = [
endpoint: '/post.json?tags=md5:',
quirks: a =>
a.map((e: any) => ({
+ source: e.source,
+ page: `https://lolibooru.moe/post/show/${e.id}`,
ext: e.file_url.substr(e.file_url.lastIndexOf('.') + 1),
full_url: e.file_url,
preview_url: e.preview_url,
@@ -120,6 +134,8 @@ const extract = async (b: Buffer, fn?: string) => {
}
let cachedFile: ArrayBuffer;
return {
+ source: result[0].source,
+ page: result[0].page,
filename: fn!.substring(0, 33) + result[0].ext,
thumbnail: (await (await GM_fetch(result[0].preview_url)).arrayBuffer()),
data: async (lsn) => {