~

WeNeedCoffee · Oct 30, 2021 · 7af59b8 · 7af59b8
1 parent 559432d
commit 7af59b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/storage/database.lua b/storage/database.lua
@@ -56,19 +56,23 @@ while true do
             local found = false
             for _, entry in ipairs(rgxdata) do
                 if not found then
-                    if entry.str ~= nil then
-                        if string.match(s.item, entry.str) then
-                            rednet.broadcast({["return"] = "success", ["location"] = entry, ["item"] = s.item}, "return:" .. s.item)
-                            found = true
-                        end
+                    if string.match(s.item, entry.str) then
+                        rednet.broadcast(
+                            {["return"] = "success", ["location"] = entry, ["item"] = s.item},
+                            "return:" .. s.item
+                        )
+                        found = true
                     end
                 end
             end
             if not found then
                 rednet.broadcast({["return"] = "none"}, "return:" .. s.item)
             end
         else
-            rednet.broadcast({["return"] = "success", ["location"] = items[s.item], ["item"] = s.item}, "return:" .. s.item)
+            rednet.broadcast(
+                {["return"] = "success", ["location"] = items[s.item], ["item"] = s.item},
+                "return:" .. s.item
+            )
         end
     elseif s.call == "del" then
         if items[s.item] then

diff --git a/storage/remote.lua b/storage/remote.lua
@@ -106,7 +106,7 @@ elseif method == "setr" then
     print(serializeTable(get(tArgs[2])))
 elseif method == "del" then
     rednet.broadcast(call)
-    rednet.broadcast({["call"] = "get", ["del"] = tArgs[2]})
+    rednet.broadcast({["call"] = "del", ["item"] = tArgs[2]})
     print(serializeTable(get(tArgs[2])))
 elseif method == "get" then
     print(serializeTable(get(tArgs[2])))