Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
7nik committed Nov 14, 2023
1 parent 308e977 commit ae98d32
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ap-vk-poster",
"version": "2.6.0",
"version": "2.6.1",
"private": true,
"scripts": {
"build": "rollup -c --environment PROD",
Expand Down
2 changes: 1 addition & 1 deletion src/Button.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export let error = false;
</script>

<button class:error disabled={disabled || error} on:click>
<button class:error disabled={disabled} on:click>
<slot/>
</button>

Expand Down
20 changes: 8 additions & 12 deletions src/PostMaker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@
let picture: Promise<File> = getPostInfo().then((post) => {
({ message, previewUrl, source, error } = post);
if (error) {
return new Promise(() => {});
}
}).then(() => {
return GM.xmlHttpRequest({
method: "GET",
Expand All @@ -80,13 +77,7 @@
});
// create and keep updated a preview object for the post
let postPreview: PostPreview = {
preview: previewUrl,
link: "",
date: pubtimeDate?.getTime() ?? 0,
};
$: if (pubtimeDate) {
postPreview.date = pubtimeDate.getTime();
previews = previews.sort((a, b) => b.date - a.date);
}
Expand Down Expand Up @@ -115,7 +106,7 @@
return;
}
console.error(ex);
error ||= "Ошибка подключения в ВК";
error = "Ошибка подключения к ВК";
return;
}
posts.sort((a, b) => b.date - a.date);
Expand All @@ -136,7 +127,12 @@
}
return null;
}).filter((p): p is PostPreview => p !== null);
previews.unshift(postPreview);
await picture;
previews.unshift({
preview: previewUrl,
link: "",
date: pubtimeDate?.getTime() ?? 0,
});
const scheduler = SETTINGS.scheduleMethod === "step"
? proposeDateByStep
Expand Down Expand Up @@ -249,7 +245,7 @@
max-height: 280px;
overflow-y: auto;
}
.previews a:last-child {
.previews :last-child {
margin-right: auto;
}
.previews > div {
Expand Down
12 changes: 8 additions & 4 deletions src/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ async function getPostInfo () {
big_preview: string,
},
tags: Array<{
tag: { id: number },
tag: {
id: number,
tag: string,
tag_ru: string,
},
relation: { removetime: string|null },
}>,
} = await fetch(`/api/v3/posts/${postId}`).then((resp) => resp.json());
Expand All @@ -61,15 +65,15 @@ async function getPostInfo () {
if (post.post.erotics > SETTINGS.maxErotic) {
error = "Слишком эротично";
}
if (post.tags.some((t) => SETTINGS.forbiddenTags.includes(t.tag.id))) {
error = "Есть запрещённые теги";
const tags = post.tags.filter((t) => SETTINGS.forbiddenTags.includes(t.tag.id))
if (tags.length > 0) {
error = `Есть запрещённые теги: ${tags.map(({ tag }) => tag.tag_ru || tag.tag).join(", ")}`;
}

return {
message,
previewUrl,
source: `https://anime-pictures.net/posts/${postId}?lang=ru`,
erotic: post.post.erotics,
error,
}
}
Expand Down

0 comments on commit ae98d32

Please sign in to comment.