From fc708d2ae417633e353ee6b2178165b70a8f368a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 23 Feb 2026 10:32:33 +0100 Subject: [PATCH] lint fixes --- backend/src/db/seed.ts | 2 +- backend/src/graphql/resolvers/groups.ts | 2 +- .../src/graphql/resolvers/notifications.ts | 2 +- backend/src/graphql/resolvers/reports.ts | 2 +- backend/src/graphql/resolvers/rooms.ts | 2 +- backend/src/graphql/resolvers/searches.ts | 4 ++-- .../graphql/resolvers/searches/queryString.ts | 20 +++++++++---------- .../src/graphql/resolvers/users/location.ts | 8 +++----- .../notifications/notificationsMiddleware.ts | 4 ++-- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts index ec59833ff..056d51dfe 100644 --- a/backend/src/db/seed.ts +++ b/backend/src/db/seed.ts @@ -1235,7 +1235,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] // Jenny users for (let i = 0; i < 30; i++) { - await Factory.build('user', { name: `Jenny${i}` }) + await Factory.build('user', { name: `Jenny${String(i)}` }) } // Jenny posts diff --git a/backend/src/graphql/resolvers/groups.ts b/backend/src/graphql/resolvers/groups.ts index 0fa303c42..5885c2571 100644 --- a/backend/src/graphql/resolvers/groups.ts +++ b/backend/src/graphql/resolvers/groups.ts @@ -18,7 +18,7 @@ import { createOrUpdateLocations } from './users/location' import type { Context } from '@src/context' -const removeUserFromGroupWriteTxResultPromise = async (session, groupId, userId) => { +const removeUserFromGroupWriteTxResultPromise = (session, groupId, userId) => { return session.writeTransaction(async (transaction) => { const removeUserFromGroupCypher = ` MATCH (user:User {id: $userId})-[membership:MEMBER_OF]->(group:Group {id: $groupId}) diff --git a/backend/src/graphql/resolvers/notifications.ts b/backend/src/graphql/resolvers/notifications.ts index 992cb3e65..94f02dd82 100644 --- a/backend/src/graphql/resolvers/notifications.ts +++ b/backend/src/graphql/resolvers/notifications.ts @@ -21,7 +21,7 @@ export default { notifications: async (_parent, args, context, _resolveInfo) => { const { user: currentUser } = context const session = context.driver.session() - let whereClause, orderByClause + let whereClause: string, orderByClause: string switch (args.read) { case true: diff --git a/backend/src/graphql/resolvers/reports.ts b/backend/src/graphql/resolvers/reports.ts index a22928115..6eb391b78 100644 --- a/backend/src/graphql/resolvers/reports.ts +++ b/backend/src/graphql/resolvers/reports.ts @@ -45,7 +45,7 @@ export default { reports: async (_parent, params, context, _resolveInfo) => { const { driver } = context const session = driver.session() - let orderByClause + let orderByClause: string const filterClauses: string[] = [] switch (params.orderBy) { case 'createdAt_asc': diff --git a/backend/src/graphql/resolvers/rooms.ts b/backend/src/graphql/resolvers/rooms.ts index 44c0faba4..123f6052e 100644 --- a/backend/src/graphql/resolvers/rooms.ts +++ b/backend/src/graphql/resolvers/rooms.ts @@ -11,7 +11,7 @@ import { ROOM_COUNT_UPDATED } from '@constants/subscriptions' import Resolver from './helpers/Resolver' -export const getUnreadRoomsCount = async (userId, session) => { +export const getUnreadRoomsCount = (userId, session) => { return session.readTransaction(async (transaction) => { const unreadRoomsCypher = ` MATCH (user:User { id: $userId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User) diff --git a/backend/src/graphql/resolvers/searches.ts b/backend/src/graphql/resolvers/searches.ts index 87f690bf1..036630b41 100644 --- a/backend/src/graphql/resolvers/searches.ts +++ b/backend/src/graphql/resolvers/searches.ts @@ -107,8 +107,8 @@ const countGroupsSetup = { ...countSetup, } -const searchResultPromise = async (session, setup, params) => { - return session.readTransaction(async (transaction) => { +const searchResultPromise = (session, setup, params) => { + return session.readTransaction((transaction) => { return transaction.run(cypherTemplate(setup), params) }) } diff --git a/backend/src/graphql/resolvers/searches/queryString.ts b/backend/src/graphql/resolvers/searches/queryString.ts index 6338759e7..450621c43 100644 --- a/backend/src/graphql/resolvers/searches/queryString.ts +++ b/backend/src/graphql/resolvers/searches/queryString.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -export function normalizeWhitespace(str) { +export function normalizeWhitespace(str: string) { // delete the first character if it is !, @ or # return str .replace(/^([!@#])/, '') @@ -12,32 +12,32 @@ export function normalizeWhitespace(str) { .trim() } -export function escapeSpecialCharacters(str) { +export function escapeSpecialCharacters(str: string) { return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1') } -const matchWholeText = (str, boost = 8) => { - return `"${String(str)}"^${String(boost)}` +const matchWholeText = (str: string, boost = 8) => { + return `"${str}"^${String(boost)}` } -const matchEachWordExactly = (str, boost = 4) => { +const matchEachWordExactly = (str: string, boost = 4) => { if (!str.includes(' ')) return '' const tmp = str .split(' ') - .map((s, i) => (i === 0 ? `"${String(s)}"` : `AND "${String(s)}"`)) + .map((s, i) => (i === 0 ? `"${s}"` : `AND "${s}"`)) .join(' ') return `(${tmp})^${String(boost)}` } -const matchSomeWordsExactly = (str, boost = 2) => { +const matchSomeWordsExactly = (str: string, boost = 2) => { if (!str.includes(' ')) return '' return str .split(' ') - .map((s) => `"${String(s)}"^${String(boost)}`) + .map((s) => `"${s}"^${String(boost)}`) .join(' ') } -const matchBeginningOfWords = (str) => { +const matchBeginningOfWords = (str: string) => { return str .split(' ') .filter((s) => s.length >= 2) @@ -45,7 +45,7 @@ const matchBeginningOfWords = (str) => { .join(' ') } -export function queryString(str) { +export function queryString(str: string) { const normalizedString = normalizeWhitespace(str) const escapedString = escapeSpecialCharacters(normalizedString) return ` diff --git a/backend/src/graphql/resolvers/users/location.ts b/backend/src/graphql/resolvers/users/location.ts index 9a112eb05..6836dbc24 100644 --- a/backend/src/graphql/resolvers/users/location.ts +++ b/backend/src/graphql/resolvers/users/location.ts @@ -76,10 +76,8 @@ export const createOrUpdateLocations = async ( if (locationName !== null) { const response: any = await fetch( `https://api.mapbox.com/geocoding/v5/mapbox.places/${encodeURIComponent( - String(locationName), - )}.json?access_token=${String( - context.config.MAPBOX_TOKEN, - )}&types=region,place,country,address&language=${locales.join(',')}`, + locationName, + )}.json?access_token=${context.config.MAPBOX_TOKEN}&types=region,place,country,address&language=${locales.join(',')}`, { signal: AbortSignal.timeout(REQUEST_TIMEOUT), }, @@ -161,7 +159,7 @@ export const createOrUpdateLocations = async ( export const queryLocations = async ({ place, lang }, context: Context) => { const res: any = await fetch( - `https://api.mapbox.com/geocoding/v5/mapbox.places/${String(place)}.json?access_token=${String(context.config.MAPBOX_TOKEN)}&types=region,place,country&language=${String(lang)}`, + `https://api.mapbox.com/geocoding/v5/mapbox.places/${place}.json?access_token=${context.config.MAPBOX_TOKEN}&types=region,place,country&language=${lang}`, { signal: AbortSignal.timeout(REQUEST_TIMEOUT), }, diff --git a/backend/src/middleware/notifications/notificationsMiddleware.ts b/backend/src/middleware/notifications/notificationsMiddleware.ts index 7c02fdba0..28c8b3a9a 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.ts +++ b/backend/src/middleware/notifications/notificationsMiddleware.ts @@ -210,7 +210,7 @@ const notifyMemberOfGroup = async (groupId, userId, reason, context) => { const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => { if (!idsOfUsers?.length) return [] - await validateNotifyUsers(label, reason) + validateNotifyUsers(label, reason) let mentionedCypher switch (reason) { case 'mentioned_in_post': { @@ -277,7 +277,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => { } const notifyUsersOfComment = async (label, commentId, reason, context) => { - await validateNotifyUsers(label, reason) + validateNotifyUsers(label, reason) const session = context.driver.session() try { return await session.writeTransaction(async (transaction) => {