diff --git a/.woodpecker/dockerHubRelease.yml b/.woodpecker/dockerHubRelease.yml index 4d0edcf378..e995b3fd01 100644 --- a/.woodpecker/dockerHubRelease.yml +++ b/.woodpecker/dockerHubRelease.yml @@ -11,10 +11,5 @@ pipeline: password: # Secret 'docker_password' needs to be set in the CI settings from_secret: docker_password - when: - # Push new version of tag latest if new push on main-branch - event: push - branch: main -depends_on: - - prSecurityCheck +branch: main diff --git a/packages/backend/src/misc/nyaize.ts b/packages/backend/src/misc/nyaize.ts index 7ec26c1eb7..b85f1d918e 100644 --- a/packages/backend/src/misc/nyaize.ts +++ b/packages/backend/src/misc/nyaize.ts @@ -2,9 +2,9 @@ export function nyaize(text: string): string { return ( text // ja-JP - .replace(/な/g, "にゃ") - .replace(/ナ/g, "ニャ") - .replace(/ナ/g, "ニャ") + .replaceAll("な", "にゃ") + .replaceAll("ナ", "ニャ") + .replaceAll("ナ", "ニャ") // en-US .replace(/(?<=n)a/gi, (x) => (x === "A" ? "YA" : "ya")) .replace(/(?<=morn)ing/gi, (x) => (x === "ING" ? "YAN" : "yan")) diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts index 8cf9ce8fb0..d8d0dbbf73 100644 --- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts +++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts @@ -93,7 +93,7 @@ export default define(meta, paramDef, async (ps, me) => { try { if (ps.tag) { - if (!safeForSql(ps.tag)) throw new Error("Injection"); + if (!safeForSql(normalizeForSearch(ps.tag))) throw "Injection"; query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`); } else { query.andWhere( @@ -102,7 +102,8 @@ export default define(meta, paramDef, async (ps, me) => { qb.orWhere( new Brackets((qb) => { for (const tag of tags) { - if (!safeForSql(tag)) throw new Error("Injection"); + if (!safeForSql(normalizeForSearch(ps.tag))) + throw "Injection"; qb.andWhere(`'{"${normalizeForSearch(tag)}"}' <@ note.tags`); } }), diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts index 635d706fc5..61a8c6b268 100644 --- a/packages/backend/src/services/following/create.ts +++ b/packages/backend/src/services/following/create.ts @@ -209,12 +209,12 @@ export default async function ( await Blockings.delete(blocking.id); } else { // それ以外は単純に例外 - if (blocking != null) + if (blocking) throw new IdentifiableError( "710e8fb0-b8c3-4922-be49-d5d93d8e6a6e", "blocking", ); - if (blocked != null) + if (blocked) throw new IdentifiableError( "3338392a-f764-498d-8855-db939dcf8c48", "blocked", diff --git a/packages/backend/src/services/following/requests/create.ts b/packages/backend/src/services/following/requests/create.ts index 0833f2aeb2..8b2e86ab5b 100644 --- a/packages/backend/src/services/following/requests/create.ts +++ b/packages/backend/src/services/following/requests/create.ts @@ -38,8 +38,8 @@ export default async function ( }), ]); - if (blocking != null) throw new Error("blocking"); - if (blocked != null) throw new Error("blocked"); + if (blocking) throw new Error("blocking"); + if (blocked) throw new Error("blocked"); const followRequest = await FollowRequests.insert({ id: genId(), diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue index ac19832553..b26eb12060 100644 --- a/packages/client/src/components/MkEmojiPicker.vue +++ b/packages/client/src/components/MkEmojiPicker.vue @@ -316,7 +316,7 @@ function done(query?: any): boolean | void { if (query == null) query = q.value; if (query == null || typeof query !== 'string') return; - const q2 = query.replace(/:/g, ''); + const q2 = query.replaceAll(':', ''); const exactMatchCustom = customEmojis.find(emoji => emoji.name === q2); if (exactMatchCustom) { chosen(exactMatchCustom);