pinks
/
eris
1
0
Fork 4
Code Issues 15 Pull Requests 1 Activity

PR #24

Merged
pinks merged 11 commits from nameless/eris:pr-main into main 2023-11-17 18:00:14 +00:00
Conversation 0 Commits 11 Files Changed 14 +38 -25
6 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2f62c17e32 - Show all commits

4
app/userDailyStatsStore.ts
View File

@ -26,8 +26,8 @@ export const getUserDailyStats = kvMemoize(
for await (
const generation of generationStore.listBy("fromId", {
before: new Date(new Date(year, month - 1, day).getTime() + 24 * 60 * 60 * 1000),
after: new Date(year, month - 1, day),
after: new Date(Date.UTC(year, month - 1, day)),
nameless marked this conversation as resolved Outdated
pinks commented 2023-11-11 13:09:02 +00:00
Outdated
Review
Copy Link

You need to use Date.UTC or UTCDateMini here. Otherwise it will return midnight but in local timezone.

For example:

    after: new Date(Date.UTC(year, month - 1, day)),
    before: new Date(Date.UTC(year, month - 1, day + 1)), // days will overflow into months
You need to use `Date.UTC` or `UTCDateMini` here. Otherwise it will return midnight but in local timezone. For example: ```js after: new Date(Date.UTC(year, month - 1, day)), before: new Date(Date.UTC(year, month - 1, day + 1)), // days will overflow into months ```
👍 1
before: new Date(Date.UTC(year, month - 1, day + 1)),
value: userId,
})
) {

4
bot/mod.ts
View File

@ -115,7 +115,7 @@ bot.api.setMyDescription(
bot.api.setMyCommands([
{ command: "txt2img", description: "Generate image from text" },
{ command: "img2img", description: "Generate image from image" },
{ command: "getprompt", description: "Try to extract prompt from raw file" },
{ command: "pnginfo", description: "Try to extract prompt from raw file" },
{ command: "queue", description: "Show the current queue" },
{ command: "cancel", description: "Cancel all your requests" },
]);
@ -160,7 +160,7 @@ bot.use(txt2imgQuestion.middleware());
bot.command("img2img", img2imgCommand);
bot.use(img2imgQuestion.middleware());
bot.command("getprompt", pnginfoCommand);
bot.command("pnginfo", pnginfoCommand);
pinks commented 2023-11-11 13:54:19 +00:00
Outdated
Review
Copy Link

Can we change it to imginfo? Also change all the function names if we do. Or leave the name as is

Can we change it to `imginfo`? Also change all the function names if we do. Or leave the name as is
nameless commented 2023-11-12 02:35:54 +00:00
Outdated
Review
Copy Link

leaving it as it is, will rename everything in future PR

leaving it as it is, will rename everything in future PR
bot.use(pnginfoQuestion.middleware());
bot.command("queue", queueCommand);

28
bot/parsePngInfo.ts
View File

@ -1,22 +1,24 @@
import * as ExifReader from "exifreader";
export function getPngInfo(pngData: ArrayBuffer): string | undefined {
nameless marked this conversation as resolved
pinks commented 2023-11-11 13:57:27 +00:00
Review
Copy Link

I don't like as here. How about:

export function getImageInfo(imageData: ArrayBuffer): string | undefined {
  const info = ExifReader.load(imageData);

  if (info.UserComment?.value && Array.isArray(info.UserComment.value)) {
    // JPEG image
    return String.fromCharCode(
      ...info.UserComment.value
        .filter((char): char is number => typeof char == "number")
        .filter((char) => char !== 0),
    ).replace("UNICODE", "");
  }

  if (info.parameters?.description) {
    // PNG image
    return info.parameters.description;
  }

  // Unknown image type
  return undefined;
}
I don't like `as` here. How about: ```ts export function getImageInfo(imageData: ArrayBuffer): string | undefined { const info = ExifReader.load(imageData); if (info.UserComment?.value && Array.isArray(info.UserComment.value)) { // JPEG image return String.fromCharCode( ...info.UserComment.value .filter((char): char is number => typeof char == "number") .filter((char) => char !== 0), ).replace("UNICODE", ""); } if (info.parameters?.description) { // PNG image return info.parameters.description; } // Unknown image type return undefined; } ```
👍 1
const image = ExifReader.load(pngData);
const info = ExifReader.load(pngData);
if (image.UserComment && image.UserComment.value) {
if (info.UserComment?.value && Array.isArray(info.UserComment.value)) {
// JPEG image
return String.fromCharCode.apply(
0,
(image.UserComment.value as number[]).filter((char: number) => char != 0),
)
.replace("UNICODE", "");
} else if (image.parameters && image.parameters.description) {
// PNG image
return image.parameters.description;
} else {
// Unknown image type
return undefined;
return String.fromCharCode(
...info.UserComment.value
.filter((char): char is number => typeof char == "number")
.filter((char) => char !== 0),
).replace("UNICODE", "");
}
if (info.parameters?.description) {
// PNG image
return info.parameters.description;
}
// Unknown image type
return undefined;
}
export interface PngInfo {

11
bot/pnginfoCommand.ts
View File

@ -22,7 +22,7 @@ async function pnginfo(ctx: ErisContext, includeRepliedTo: boolean): Promise<voi
if (document?.mime_type !== "image/png" && document?.mime_type !== "image/jpeg") {
await ctx.reply(
"Please send me a PNG file." +
"Please send me a PNG or JPEG file." +
nameless marked this conversation as resolved Outdated
pinks commented 2023-11-11 13:58:23 +00:00
Outdated
Review
Copy Link

"Please send me a PNG or JPEG file."

"Please send me a PNG or JPEG file."
pnginfoQuestion.messageSuffixMarkdown(),
omitUndef(
{
@ -37,7 +37,14 @@ async function pnginfo(ctx: ErisContext, includeRepliedTo: boolean): Promise<voi
const file = await ctx.api.getFile(document.file_id);
const buffer = await fetch(file.getUrl()).then((resp) => resp.arrayBuffer());
const params = parsePngInfo(getPngInfo(buffer) ?? "Nothing found.", undefined, true);
const info = getPngInfo(buffer);
nameless marked this conversation as resolved Outdated
pinks commented 2023-11-11 14:02:26 +00:00
Outdated
Review
Copy Link

Maybe split it in 3 lines:

const info = getPngInfo(buffer);
if (!info) return await ctx.reply("No info found in file.", {...});
const params = parsePngInfo(info, undefined, true);
Maybe split it in 3 lines: ```js const info = getPngInfo(buffer); if (!info) return await ctx.reply("No info found in file.", {...}); const params = parsePngInfo(info, undefined, true); ```
if (!info) {
return await ctx.reply(
"No info found in file.",
omitUndef({ reply_to_message_id: ctx.message?.message_id }),
);
}
const params = parsePngInfo(info, undefined, true);
const paramsText = fmt([
`${params.prompt}\n`,

8
ui/AdminsPage.tsx
View File

@ -56,9 +56,11 @@ export function AdminsPage(props: { sessionId: string | null }) {
)
: getAdmins.data?.length === 0
? (
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
<p key="no-admins" className="text-center text-gray-500">No admins.</p>
</li>
<ul className="flex flex-col gap-2">
nameless marked this conversation as resolved Outdated
pinks commented 2023-11-11 14:06:34 +00:00
Outdated
Review
Copy Link

li outside of ul?

`li` outside of `ul`?
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
<p key="no-admins" className="text-center text-gray-500">No admins.</p>
</li>
</ul>
)
: getAdmins.error
? <p className="alert">Loading admins failed</p>

8
ui/WorkersPage.tsx
View File

@ -39,9 +39,11 @@ export function WorkersPage(props: { sessionId: string | null }) {
)
: getWorkers.data?.length === 0
? (
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
<p key="no-workers" className="text-center text-gray-500">No workers.</p>
</li>
<ul className="flex flex-col gap-2">
nameless marked this conversation as resolved Outdated
pinks commented 2023-11-11 14:07:32 +00:00
Outdated
Review
Copy Link

li without ul

`li` without `ul`
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
<p key="no-workers" className="text-center text-gray-500">No workers.</p>
</li>
</ul>
)
: getWorkers.error
? <p className="alert">Loading workers failed</p>