Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix:Searchfile/missinglocale #37

Merged
merged 11 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1800,6 +1800,9 @@ _achievements:
_setNameToNoriDev:
title: "神様コンプレックス(CherryPick)"
description: "名前を noridev に設定した"
_setNameToYojo:
title: "ロリータコンプレックス"
description: "名前を 幼女 に設定した"
_passedSinceAccountCreated1:
title: "一周年"
description: "アカウント作成から1年経過した"
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/core/SearchService.ts
penginn-net marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,13 @@
query.andWhere('user.host = :host', { host: opts.host });
}
}

if(opts.fileOption){

Check failure on line 245 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Expected space(s) after "if"

Check failure on line 245 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Missing space before opening brace
if(opts.fileOption === 'file-only'){

Check failure on line 246 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Expected space(s) after "if"

Check failure on line 246 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Missing space before opening brace

}if(opts.fileOption === 'no-file'){

Check failure on line 248 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Expected space(s) before "if"

Check failure on line 248 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Expected space(s) after "if"

Check failure on line 248 in packages/backend/src/core/SearchService.ts

View workflow job for this annotation

GitHub Actions / lint (backend)

Missing space before opening brace

}
}
penginn-net marked this conversation as resolved.
Show resolved Hide resolved
this.queryService.generateVisibilityQuery(query, me);
if (me) this.queryService.generateMutedUserQuery(query, me);
if (me) this.queryService.generateBlockedUserQuery(query, me);
Expand Down
17 changes: 0 additions & 17 deletions packages/frontend/src/pages/search.note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,6 @@
</div>
</MkFolder>
</div>
<div class="_gaps_m">
<MkFolder :defaultOpen="true">
<template #label>{{ i18n.ts.fileAttachedOnly }}</template>
<template v-if="isfileOnly" #suffix></template>

<div style="text-align: center;" class="_gaps">
<div>
<MkRadios v-model="isfileOnly" @update:modelValue="search()">
<option value="combined">{{ i18n.ts._advancedSearch._fileOption.combined }}</option>
<option value="file-only">{{ i18n.ts._advancedSearch._fileOption.fileAttachedOnly }}</option>
<option value="no-file">{{ i18n.ts._advancedSearch._fileOption.noFile }}</option>
</MkRadios>
</div>
</div>
</MkFolder>
</div>
</MkFolder>
<div>
<MkButton large primary gradate rounded style="margin: 0 auto;" @click="search">{{ i18n.ts.search }}</MkButton>
Expand Down Expand Up @@ -134,14 +118,13 @@
query: searchQuery.value,
userId: user.value ? user.value.id : null,
origin: searchOrigin.value,
fileOption: isfileOnly.value,
},
};

if(isfileOnly.value !== 'combined')

Check failure on line 124 in packages/frontend/src/pages/search.note.vue

View workflow job for this annotation

GitHub Actions / lint (frontend)

Expected space(s) after "if"
{

Check failure on line 125 in packages/frontend/src/pages/search.note.vue

View workflow job for this annotation

GitHub Actions / lint (frontend)

Opening curly brace does not appear on the same line as controlling statement
notePagination.value.endpoint = 'notes/search-file'

Check failure on line 126 in packages/frontend/src/pages/search.note.vue

View workflow job for this annotation

GitHub Actions / lint (frontend)

Missing semicolon
notePagination.value.params.fileOption = isfileOnly.value

Check failure on line 127 in packages/frontend/src/pages/search.note.vue

View workflow job for this annotation

GitHub Actions / lint (frontend)

Missing semicolon
}
if (isLocalOnly.value) notePagination.value.params.host = '.';

Expand Down
Loading