Added String.prototype.contains

server/src/index.js

@@ -1,6 +1,7 @@
 import {} from 'dotenv/config'
 import '@babel/polyfill/noConflict'
 import './utils/capitalize'
+import './utils/contains'
 import './utils/cycle'
 
 import { logSuccess } from './lib/logger'

server/src/resolvers/Query/userPresence.js

@@ -15,17 +15,15 @@ export async function userPresence(_, { search }) {
   const filteredUsers = search
     ? usersWithWifiDevices.filter(
         user =>
-          Object.keys(user).some(key =>
+          Object.keys(user).some(
-            typeof user[key] == 'string'
+            key => typeof user[key] == 'string' && user[key].contains(search)
-              ? user[key].toLowerCase().includes(search)
-              : false
           ) ||
           user.wifiDevices?.some(
             device =>
               device.ip?.startsWith(search) ||
               (device.status != 'OFFLINE' &&
-                (device.apName?.toLowerCase().includes(search) ||
+                (device.apName?.contains(search) ||
-                  device.essid?.toLocaleLowerCase().includes(search)))
+                  device.essid?.contains(search)))
           )
       )
     : usersWithWifiDevices

server/src/utils/contains.js

@@ -0,0 +1,3 @@
+String.prototype.contains = function (term) {
+  return this.toLowerCase().includes(term.toLowerCase().trim())
+}