chore: formatting
This commit is contained in:
parent
5c56487802
commit
2cf1d9f630
6 changed files with 192 additions and 192 deletions
|
@ -5,7 +5,7 @@ introMisskey: "Welcome! Calckey is an open source, decentralized social media pl
|
||||||
\ that's free forever! \U0001F680"
|
\ that's free forever! \U0001F680"
|
||||||
monthAndDay: "{month}/{day}"
|
monthAndDay: "{month}/{day}"
|
||||||
search: "Search"
|
search: "Search"
|
||||||
search_placeholder: "Enter search terms..."
|
searchPlaceholder: "Search Calckey"
|
||||||
notifications: "Notifications"
|
notifications: "Notifications"
|
||||||
username: "Username"
|
username: "Username"
|
||||||
password: "Password"
|
password: "Password"
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import {Health, MeiliSearch, Stats} from "meilisearch";
|
import { Health, MeiliSearch, Stats } from "meilisearch";
|
||||||
import {dbLogger} from "./logger.js";
|
import { dbLogger } from "./logger.js";
|
||||||
|
|
||||||
import config from "@/config/index.js";
|
import config from "@/config/index.js";
|
||||||
import {Note} from "@/models/entities/note.js";
|
import { Note } from "@/models/entities/note.js";
|
||||||
import * as url from "url";
|
import * as url from "url";
|
||||||
import {ILocalUser, User} from "@/models/entities/user.js";
|
import { ILocalUser, User } from "@/models/entities/user.js";
|
||||||
import {Followings, Users} from "@/models/index.js";
|
import { Followings, Users } from "@/models/index.js";
|
||||||
|
|
||||||
const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
|
const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
import type Bull from "bull";
|
import type Bull from "bull";
|
||||||
|
|
||||||
import {queueLogger} from "../../logger.js";
|
import { queueLogger } from "../../logger.js";
|
||||||
import {Notes} from "@/models/index.js";
|
import { Notes } from "@/models/index.js";
|
||||||
import {MoreThan} from "typeorm";
|
import { MoreThan } from "typeorm";
|
||||||
import {index} from "@/services/note/create.js";
|
import { index } from "@/services/note/create.js";
|
||||||
import {Note} from "@/models/entities/note.js";
|
import { Note } from "@/models/entities/note.js";
|
||||||
import meilisearch from "../../../db/meilisearch.js";
|
import meilisearch from "../../../db/meilisearch.js";
|
||||||
|
|
||||||
const logger = queueLogger.createSubLogger("index-all-notes");
|
const logger = queueLogger.createSubLogger("index-all-notes");
|
||||||
|
@ -33,7 +33,7 @@ export default async function indexAllNotes(
|
||||||
try {
|
try {
|
||||||
notes = await Notes.find({
|
notes = await Notes.find({
|
||||||
where: {
|
where: {
|
||||||
...(cursor ? {id: MoreThan(cursor)} : {}),
|
...(cursor ? { id: MoreThan(cursor) } : {}),
|
||||||
},
|
},
|
||||||
take: take,
|
take: take,
|
||||||
order: {
|
order: {
|
||||||
|
@ -69,7 +69,7 @@ export default async function indexAllNotes(
|
||||||
|
|
||||||
indexedCount += chunk.length;
|
indexedCount += chunk.length;
|
||||||
const pct = (indexedCount / total) * 100;
|
const pct = (indexedCount / total) * 100;
|
||||||
job.update({indexedCount, cursor, total});
|
job.update({ indexedCount, cursor, total });
|
||||||
job.progress(+pct.toFixed(1));
|
job.progress(+pct.toFixed(1));
|
||||||
logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
|
logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { Note } from "@/models/entities/note.js";
|
||||||
import config from "@/config/index.js";
|
import config from "@/config/index.js";
|
||||||
import es from "../../../../db/elasticsearch.js";
|
import es from "../../../../db/elasticsearch.js";
|
||||||
import sonic from "../../../../db/sonic.js";
|
import sonic from "../../../../db/sonic.js";
|
||||||
import meilisearch, {MeilisearchNote} from "../../../../db/meilisearch.js";
|
import meilisearch, { MeilisearchNote } from "../../../../db/meilisearch.js";
|
||||||
import define from "../../define.js";
|
import define from "../../define.js";
|
||||||
import { makePaginationQuery } from "../../common/make-pagination-query.js";
|
import { makePaginationQuery } from "../../common/make-pagination-query.js";
|
||||||
import { generateVisibilityQuery } from "../../common/generate-visibility-query.js";
|
import { generateVisibilityQuery } from "../../common/generate-visibility-query.js";
|
||||||
|
|
|
@ -5,7 +5,7 @@ import { mainRouter } from "@/router";
|
||||||
export async function search() {
|
export async function search() {
|
||||||
const { canceled, result: query } = await os.inputText({
|
const { canceled, result: query } = await os.inputText({
|
||||||
title: i18n.ts.search,
|
title: i18n.ts.search,
|
||||||
placeholder: i18n.ts.search_placeholder,
|
placeholder: i18n.ts.searchPlaceholder,
|
||||||
text:
|
text:
|
||||||
"Advanced search operators\n" +
|
"Advanced search operators\n" +
|
||||||
"from:user => filter by user\n" +
|
"from:user => filter by user\n" +
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import {onBeforeUnmount, onMounted} from "vue";
|
import { onBeforeUnmount, onMounted } from "vue";
|
||||||
import bytes from "@/filters/bytes";
|
import bytes from "@/filters/bytes";
|
||||||
import {i18n} from "@/i18n";
|
import { i18n } from "@/i18n";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
connection: any;
|
connection: any;
|
||||||
|
|
Loading…
Reference in a new issue