From 99d7fe49bf1688400a57568a66f23e0ccbbed429 Mon Sep 17 00:00:00 2001 From: Marcel Lorbeer Date: Thu, 27 Jul 2023 07:43:12 +0200 Subject: [PATCH 01/19] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a04e554 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Marcel Lorbeer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- 2.47.2 From 7074c09629c86987e89bb27250da6d2022a74061 Mon Sep 17 00:00:00 2001 From: Marcel Lorbeer Date: Thu, 27 Jul 2023 07:45:53 +0200 Subject: [PATCH 02/19] Update README.md --- README.md | Bin 48 -> 1518 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index 411c66cc4010da1ecf6c13eb021bae55d7a13d96..c17e94bd2633d5b2ddc40a0efe93e3566a5a2e10 100644 GIT binary patch literal 1518 zcmbVMO>f&U480rhf8g9p0yGY~-3s(Dq!|#P-G;8+B`8qErW38Q=;_00HtfHTvh1{L zT43l=67|UU_{bx;@B*%ArRV`>N}_g9kpZ_sxD=-Nw$lZC{JKb!G&wqgFD;r@;x4UK7Ix&p5lHROh{C~Ey3Iiz@K)+|haBFe?rY0o;h-_p$`UOUq+8UnSg#8w zNm~%Q1n;DhPI5>fVNuiyt?hEIjReWZWykHI-grsEmR#X6ONP{DFmIgbz7f;ZH9Ob`bjy|AgDZ z$i~?qELY9hqJGcY2URbVi1G|vZ>(5jn%v#pDKFAwGJ*Mns2eVkLffHOdBy#g}Xx{%{cs%}wM|e?{s;6cn972iSOmvuF6Z#_cE* z`6@5=fS2MPgN?h)Xq_D}O5p?}M5xm>x)~|O`m<9;nd8XEb2bj|bL|ZKYxFx!0G62+ zHD=-g8 zGHJt8;K4oW4SG(6uX#{=hkgpqL?@)elKsTSucOo1>>Jt!Yj_)lJm}GjvwjS00Ks1j zR>-S>I{z)pr)h6T8|NB(I-T;h%>#MMt0FJ49S`Q3QP66|Gf6s4o}PGE+0|QA1=aWt z7FD+#D#;Tp^bVx8EJv8QjcBpEvVOhhZiGQUh6+(ZWspe`P=lI7VA=h8tZU8d!?Opd zo(BI&$s6k&+v!m1#H=1Bu?y3fa2zsPzpAAJ0n5fKHTdOiumQpD<+$J-qb*O{^+wvT s%fg&9S5WbRx0f!1-n?0tmy2uYKfEnBFZ302m3n%yn9Vx842A0 -- 2.47.2 From 57020c6b246d32cf75c231b54cf7452ca3db0b46 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:26:23 +0200 Subject: [PATCH 03/19] Update MarcSyncv1.0.lua --- src/MarcSync/MarcSyncv1.0.lua | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/MarcSync/MarcSyncv1.0.lua b/src/MarcSync/MarcSyncv1.0.lua index ef8a2b5..5b3f06a 100644 --- a/src/MarcSync/MarcSyncv1.0.lua +++ b/src/MarcSync/MarcSyncv1.0.lua @@ -8,50 +8,50 @@ local tokens = { local Utils = require(script.Parent.Utils) local MarcSyncClient = {} -MarcSyncClient.getVersion = function(self:typeof(MarcSyncClient), clientId: number?):string +MarcSyncClient.bekommeVersion = function(self:typeof(MarcSyncClient), clientId: number?):string self:_checkInstallation() local url = "" if clientId then url = "/"..clientId end - local result = Utils.makeHTTPRequest("GET", "https://api.marcsync.dev/v0/utils/version"..url); + local result = Utils.macheHypertexttransferprotokollAnfrage("GET", "https://api.marcsync.dev/v0/utils/version"..url); return result["version"] end -MarcSyncClient.createCollection = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) - if not self._accessToken then error("[MarcSync] Please set a Token before using MarcSync.") end - if not collectionName then error("No CollectionName Provided") end - local result = Utils.makeHTTPRequest("collection", "POST", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken); +MarcSyncClient.erzeugeKollektion = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) + if not self._accessToken then error("[MarkSynchronisation] Bitte legen Sie ein Token fest, bevor Sie MarcSync verwenden.") end + if not collectionName then error("Kein CollectionName angegeben") end + local result = Utils.macheHypertexttransferprotokollAnfrage("collection", "POST", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end - result = require(script.Parent.Objects.Collection).new(collectionName, self._accessToken) + result = require(script.Parent.Objects.Collection).neu(collectionName, self._accessToken) return result end -MarcSyncClient.fetchCollection = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) +MarcSyncClient.bringeKollektion = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) self:_checkInstallation() - if not collectionName then error("No CollectionName Provided") end - local result = Utils.makeHTTPRequest("collection", "GET", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken); + if not collectionName then error("Kein CollectionName angegeben") end + local result = Utils.macheHypertexttransferprotokollAnfrage("collection", "GET", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end - result = require(script.Parent.Objects.Collection).new(collectionName, self._accessToken) + result = require(script.Parent.Objects.Collection).neu(collectionName, self._accessToken) return result end -MarcSyncClient.getCollection = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) - if typeof(self) ~= "table" then error("Please use : instead of .") end +MarcSyncClient.bekommeKollektion = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) + if typeof(self) ~= "table" then error("Bitte verwenden Sie : anstelle von .") end self:_checkInstallation() - if not collectionName then error("No CollectionName Provided") end - return require(script.Parent.Objects.Collection).new(collectionName, self._accessToken) + if not collectionName then error("Kein CollectionName angegeben") end + return require(script.Parent.Objects.Collection).neu(collectionName, self._accessToken) end return { - new = function(accessToken: string):typeof(MarcSyncClient) - if not accessToken then warn("Token not provided while creating a new MarcSync Object.") end - if not tokens[accessToken] then warn("Token provided for creating a new MarcSync Object not Found in Token Table, using it as token instead.") else accessToken = tokens[accessToken] end + neu = function(accessToken: string):typeof(MarcSyncClient) + if not accessToken then warn("Beim Erstellen eines neuen MarcSync-Objekts wurde kein Token bereitgestellt.") end + if not tokens[accessToken] then warn("Token zum Erstellen eines neuen MarcSync-Objekts, das nicht in der Token-Tabelle gefunden wird und stattdessen als Token verwendet wird.") else accessToken = tokens[accessToken] end local self = {} self._accessToken = accessToken self._checkInstallation = function() - if not self then error("Please Setup MarcSync before using MarcSync.") end - if not self._accessToken then error("[MarcSync] Please set a Token before using MarcSync.") end + if not self then error("Bitte richten Sie MarcSync ein, bevor Sie MarcSync verwenden.") end + if not self._accessToken then error("[MarkSynchronisation] Bitte legen Sie ein Token fest, bevor Sie MarcSync verwenden.") end --print(HttpService.HttpEnabled) --if not HttpService.HttpEnabled then error("Please Enable HTTPService in order to use MarcSync.") end end @@ -62,4 +62,4 @@ return { return self end -} \ No newline at end of file +} -- 2.47.2 From d1bfaf3ccf92f65b10ef1a2562e7ae7ff7240070 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:26:40 +0200 Subject: [PATCH 04/19] Update Utils.lua --- src/MarcSync/Utils.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/MarcSync/Utils.lua b/src/MarcSync/Utils.lua index 194e2b2..1718b43 100644 --- a/src/MarcSync/Utils.lua +++ b/src/MarcSync/Utils.lua @@ -4,14 +4,14 @@ local EntryError = require(script.Parent.Errors.Entry) local HttpService = game:GetService("HttpService") -function errorHandler(type: string, resultBody: any, resultObject: {}) +function fehlerMisshandlung(type: string, resultBody: any, resultObject: {}) local Error; if typeof(resultBody) == typeof({}) and resultBody["message"] then Error = resultBody["message"] elseif typeof(resultBody) == typeof("") then Error = resultBody else - Error = "An Unexpected Error occoured." + Error = "Es ist ein unerwarteter Fehler aufgetreten." end if type == "collection" then @@ -37,7 +37,7 @@ end local utils = {} -function utils.makeHTTPRequest(type: string, method: string, url: string, body: {}, authorization: string):{["success"]: boolean, ["message"]: string} +function utils.macheHypertexttransferprotokollAnfrage(type: string, method: string, url: string, body: {}, authorization: string):{["success"]: boolean, ["message"]: string} local resultObj; local resultBody; local success = pcall(function() @@ -51,10 +51,10 @@ function utils.makeHTTPRequest(type: string, method: string, url: string, body: end end) if success and resultBody and resultBody["success"] then - if resultBody["warning"] then warn('[MarcSync HTTPRequest Handler] MarcSync HTTP Request returned warning for URL "'..url..'" with body: "'..HttpService:JSONEncode(body)..'": '..resultBody["warning"]) end + if resultBody["warning"] then warn('[MarkSynchronisation Hypertexttransferprotokoll Misshandler] Die MarcSync-HTTP-Anfrage hat eine Warnung zurückgegeben für die URL "'..url..'" mit Koerper: "'..HttpService:JSONEncode(body)..'": '..resultBody["warning"]) end return resultBody end - return errorHandler(type, resultBody, resultObj) + return fehlerMisshandlung(type, resultBody, resultObj) end -return utils \ No newline at end of file +return utils -- 2.47.2 From 571147e39ee5c94c275eccb45078e01b63f3f62d Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:26:54 +0200 Subject: [PATCH 05/19] Update EntryData.lua --- src/MarcSync/Types/EntryData.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MarcSync/Types/EntryData.lua b/src/MarcSync/Types/EntryData.lua index c9f8aa1..5b0dc0a 100644 --- a/src/MarcSync/Types/EntryData.lua +++ b/src/MarcSync/Types/EntryData.lua @@ -3,7 +3,7 @@ type EntryData = { } return { - getType = function(): EntryData + bekommeRassenindentifikationsspezifizierunginstanztextaufzaehlbar = function(): EntryData return {} end, -} \ No newline at end of file +} -- 2.47.2 From 227146a5189d53fe6262f26dbf6dd90bd61c7cde Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:27:10 +0200 Subject: [PATCH 06/19] Update Collection.lua --- src/MarcSync/Objects/Collection.lua | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/MarcSync/Objects/Collection.lua b/src/MarcSync/Objects/Collection.lua index 73c0d79..7c8efc8 100644 --- a/src/MarcSync/Objects/Collection.lua +++ b/src/MarcSync/Objects/Collection.lua @@ -2,18 +2,18 @@ local Utils = require(script.Parent.Parent.Utils) local Entry = require(script.Parent.Entry) local types = { - EntryData = require(script.Parent.Parent.Types.EntryData).getType() + EntryData = require(script.Parent.Parent.Types.EntryData).bekommeRassenindentifikationsspezifizierunginstanztextaufzaehlbar() } local Collection = {} -Collection.createEntry = function(self:typeof(Collection), data:typeof(types.EntryData)):typeof(Entry.new()) - if not self._collectionName then error("[MarcSync: Collection] Invalid Object created or trying to access an destroied object.") end - local result = Utils.makeHTTPRequest("entry", "POST", "https://api.marcsync.dev/v0/entries/"..self._collectionName, {["data"]=data}, self._accessToken); +Collection.erzeugeEintrag = function(self:typeof(Collection), data:typeof(types.EntryData)):typeof(Entry.new()) + if not self._collectionName then error("[MarkSynchronisation: Sammlung] Ungültiges Objekt erstellt oder versucht, auf ein zerstörtes Objekt zuzugreifen.") end + local result = Utils.macheHypertexttransferprotokollAnfrage("entry", "POST", "https://api.marcsync.dev/v0/entries/"..self._collectionName, {["data"]=data}, self._accessToken); if result["success"] and result["objectId"] then data["_id"] = result["objectId"] - result = require(script.Parent.Entry).new(self._collectionName, data, self._accessToken) + result = require(script.Parent.Entry).neu(self._collectionName, data, self._accessToken) else error(result["errorMessage"]) end @@ -21,22 +21,22 @@ Collection.createEntry = function(self:typeof(Collection), data:typeof(types.Ent return result end -Collection.updateEntries = function(self:typeof(Collection), filters:typeof(types.EntryData), data:typeof(types.EntryData)):number - if not self._collectionName then error("[MarcSync: Collection] Invalid Object created or trying to access an destroied object.") end - local result = Utils.makeHTTPRequest("entry", "PUT", "https://api.marcsync.dev/v0/entries/"..self._collectionName, {["filters"]=filters,["data"]=data}, self._accessToken); +Collection.aktualisiereEintrag = function(self:typeof(Collection), filters:typeof(types.EntryData), data:typeof(types.EntryData)):number + if not self._collectionName then error("[MarkSynchronisation: Sammlung] Ungültiges Objekt erstellt oder versucht, auf ein zerstörtes Objekt zuzugreifen.") end + local result = Utils.macheHypertexttransferprotokollAnfrage("eintrag", "PUT", "https://api.marcsync.dev/v0/entries/"..self._collectionName, {["filters"]=filters,["data"]=data}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end return result["modifiedEntries"] end -Collection.getEntries = function(self:typeof(Collection), filters:typeof(types.EntryData)):{[number]:typeof(Entry.new())} - if not self._collectionName then error("[MarcSync: Collection] Invalid Object created or trying to access an destroied object.") end +Collection.bekommeEintraege = function(self:typeof(Collection), filters:typeof(types.EntryData)):{[number]:typeof(Entry.new())} + if not self._collectionName then error("[MarkSynchronisation: Sammlung] Ungültiges Objekt erstellt oder versucht, auf ein zerstörtes Objekt zuzugreifen.") end if not filters then filters = {} end - local result = Utils.makeHTTPRequest("entry", "DELETE", "https://api.marcsync.dev/v0/entries/"..self._collectionName.."?isQuery=true", {["filters"]=filters}, self._accessToken); + local result = Utils.macheHypertexttransferprotokollAnfrage("eintrag", "DELETE", "https://api.marcsync.dev/v0/entries/"..self._collectionName.."?isQuery=true", {["filters"]=filters}, self._accessToken); if result["success"] and result["entries"] then local _result = {} for index,entry in pairs(result["entries"]) do - _result[index] = require(script.Parent.Entry).new(self._collectionName, entry, self._accessToken) + _result[index] = require(script.Parent.Entry).neu(self._collectionName, entry, self._accessToken) end result = _result else @@ -46,23 +46,23 @@ Collection.getEntries = function(self:typeof(Collection), filters:typeof(types.E return result end -Collection.deleteEntries = function(self:typeof(Collection), filters:typeof(types.EntryData)):number - if not self._collectionName then error("[MarcSync: Collection] Invalid Object created or trying to access an destroied object.") end - local result = Utils.makeHTTPRequest("DELETE", "https://api.marcsync.dev/v0/entries/"..self._collectionName, {["filters"]=filters}, self._accessToken); +Collection.loescheEintrag = function(self:typeof(Collection), filters:typeof(types.EntryData)):number + if not self._collectionName then error("[MarkSynchronisation: Sammlung] Ungültiges Objekt erstellt oder versucht, auf ein zerstörtes Objekt zuzugreifen.") end + local result = Utils.macheHypertexttransferprotokollAnfrage("eintrag", "DELETE", "https://api.marcsync.dev/v0/entries/"..self._collectionName, {["filters"]=filters}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end return result["deletedEntries"] end -Collection.drop = function(self:typeof(Collection)) - if not self._collectionName then error("[MarcSync: Collection] Invalid Object created or trying to access an destroied object.") end - local result = Utils.makeHTTPRequest("collection", "DELETE", "https://api.marcsync.dev/v0/collection/"..self._collectionName, {}, self._accessToken); +Collection.fallenlassen = function(self:typeof(Collection)) + if not self._collectionName then error("[MarkSynchronisation: Sammlung] Ungültiges Objekt erstellt oder versucht, auf ein zerstörtes Objekt zuzugreifen.") end + local result = Utils.macheHypertexttransferprotokollAnfrage("sammlung", "DELETE", "https://api.marcsync.dev/v0/collection/"..self._collectionName, {}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end self = nil end return { - new = function(collectionName: string, accessToken: string):typeof(Collection) + neu = function(collectionName: string, accessToken: string):typeof(Collection) local self = {} self._collectionName = collectionName self._accessToken = accessToken @@ -73,4 +73,4 @@ return { return self end -} \ No newline at end of file +} -- 2.47.2 From ee95d5e5e673357b24fb7c4e996580f9a91fa5c9 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:27:22 +0200 Subject: [PATCH 07/19] Update Entry.lua --- src/MarcSync/Objects/Entry.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/MarcSync/Objects/Entry.lua b/src/MarcSync/Objects/Entry.lua index d28907e..f3ca5ff 100644 --- a/src/MarcSync/Objects/Entry.lua +++ b/src/MarcSync/Objects/Entry.lua @@ -1,22 +1,22 @@ local Utils = require(script.Parent.Parent.Utils) local types = { - EntryData = require(script.Parent.Parent.Types.EntryData).getType() + EntryData = require(script.Parent.Parent.Types.EntryData).bekommeRassenindentifikationsspezifizierunginstanztextaufzaehlbar() } local Entry = {} -Entry.getValue = function(self:typeof(Entry), key:string):any +Entry.bekommeWert = function(self:typeof(Entry), key:string):any if not key then return nil end return self._entryData[key] end -Entry.getValues = function(self:typeof(Entry)):typeof(types.EntryData) +Entry.bekommeWerte = function(self:typeof(Entry)):typeof(types.EntryData) return self._entryData end -Entry.updateValues = function(self:typeof(Entry), data:typeof(types.EntryData)):number - local result = Utils.makeHTTPRequest("entry", "PUT", "https://api.marcsync.dev/v0/entries/"..self._tableId, {["filters"]={["_id"]=self._objectId},["data"]=data}, self._accessToken); +Entry.aktualisiereWerte = function(self:typeof(Entry), data:typeof(types.EntryData)):number + local result = Utils.macheHypertexttransferprotokollAnfrage("eintrag", "PUT", "https://api.marcsync.dev/v0/entries/"..self._tableId, {["filters"]={["_id"]=self._objectId},["data"]=data}, self._accessToken); if result["success"] and result["modifiedEntries"] and result["modifiedEntries"] > 0 then for i,v in pairs(data) do @@ -29,9 +29,9 @@ Entry.updateValues = function(self:typeof(Entry), data:typeof(types.EntryData)): return result["modifiedEntries"] end -Entry.delete = function(self:typeof(Entry)) - if typeof(self) ~= "table" then error("Please use : instead of .") end - local result = Utils.makeHTTPRequest("entry", "DELETE", "https://api.marcsync.dev/v0/entries/"..self._tableId, {["filters"]={["_id"]=self._objectId}}, self._accessToken); +Entry.loesche = function(self:typeof(Entry)) + if typeof(self) ~= "table" then error("Bitte verwenden Sie : anstelle von .") end + local result = Utils.macheHypertexttransferprotokollAnfrage("eintrag", "DELETE", "https://api.marcsync.dev/v0/entries/"..self._tableId, {["filters"]={["_id"]=self._objectId}}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end self = nil @@ -39,8 +39,8 @@ Entry.delete = function(self:typeof(Entry)) end return { - new = function(tableId:string, entryData:typeof(types.EntryData), accessToken:string):typeof(Entry) - if not tableId or not entryData or not entryData["_id"] or not accessToken then error("[MarcSync: Entry] Tried creating invalid Entry Object.") end + neu = function(tableId:string, entryData:typeof(types.EntryData), accessToken:string):typeof(Entry) + if not tableId or not entryData or not entryData["_id"] or not accessToken then error("[MarkSynchronisation: Eintrag] Es wurde versucht, ein ungültiges Eintragsobjekt zu erstellen.") end local self = {} self._tableId = tableId self._entryData = entryData @@ -53,4 +53,4 @@ return { return self end -} \ No newline at end of file +} -- 2.47.2 From c3afb8694cd3f13c31a5d53c431ecfdc83fdbb5b Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:27:40 +0200 Subject: [PATCH 08/19] Update Authorization.lua --- src/MarcSync/Errors/Authorization.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MarcSync/Errors/Authorization.lua b/src/MarcSync/Errors/Authorization.lua index cfb685d..2535fd3 100644 --- a/src/MarcSync/Errors/Authorization.lua +++ b/src/MarcSync/Errors/Authorization.lua @@ -1,5 +1,5 @@ return { InvalidAccessToken = function(message: string):string - return ("[MarcSync Exception] InvalidAccessToken: %s"):format(message) + return ("[MarkSynchronisationsausnahme] InvaliederZugriffsToken: %s"):format(message) end -} \ No newline at end of file +} -- 2.47.2 From a7142926be97a2676a5d839be91205365d88939a Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:27:51 +0200 Subject: [PATCH 09/19] Update Collection.lua --- src/MarcSync/Errors/Collection.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MarcSync/Errors/Collection.lua b/src/MarcSync/Errors/Collection.lua index c59ddde..0690dd3 100644 --- a/src/MarcSync/Errors/Collection.lua +++ b/src/MarcSync/Errors/Collection.lua @@ -1,8 +1,8 @@ return { CollectionNotFound = function(message: string):string - return ("[MarcSync Exception] CollectionNotFound: %s"):format(message) + return ("[MarkSynchronisationsausnahme] SammlungNichtGefunden: %s"):format(message) end, CollectionAlreadyExists = function(message: string):string - return ("[MarcSync Exception] CollectionAlreadyExists: %s"):format(message) + return ("[MarkSynchronisationsausnahme] SammlungExistiertBereits: %s"):format(message) end -} \ No newline at end of file +} -- 2.47.2 From f0ef5549369772de134bba398c9b5703756de439 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:28:06 +0200 Subject: [PATCH 10/19] Update Entry.lua --- src/MarcSync/Errors/Entry.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MarcSync/Errors/Entry.lua b/src/MarcSync/Errors/Entry.lua index 5d51edb..2098947 100644 --- a/src/MarcSync/Errors/Entry.lua +++ b/src/MarcSync/Errors/Entry.lua @@ -1,8 +1,8 @@ return { InvalidEntryData = function(message: string):string - return ("[MarcSync Exception] InvalidEntryData: %s"):format(message) + return ("[MarkSynchronisationsausnahme] InvaliedeEintragsDaten: %s"):format(message) end, EntryNotFound = function(message: string):string - return ("[MarcSync Exception] EntryNotFound: %s"):format(message) + return ("[MarkSynchronisationsausnahme] EintragNichtGefunden: %s"):format(message) end -} \ No newline at end of file +} -- 2.47.2 From 2ad6fa40362cdb100db17340eca0b6f0f069fee9 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:36:29 +0200 Subject: [PATCH 11/19] Update and rename Utils.lua to Dienstprogramme.lua --- src/MarcSync/{Utils.lua => Dienstprogramme.lua} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename src/MarcSync/{Utils.lua => Dienstprogramme.lua} (92%) diff --git a/src/MarcSync/Utils.lua b/src/MarcSync/Dienstprogramme.lua similarity index 92% rename from src/MarcSync/Utils.lua rename to src/MarcSync/Dienstprogramme.lua index 1718b43..b6ae53f 100644 --- a/src/MarcSync/Utils.lua +++ b/src/MarcSync/Dienstprogramme.lua @@ -1,6 +1,6 @@ -local AuthorizationError = require(script.Parent.Errors.Authorization) -local CollectionError = require(script.Parent.Errors.Collection) -local EntryError = require(script.Parent.Errors.Entry) +local AuthorizationError = require(script.Parent.Errors.Autorisierung) +local CollectionError = require(script.Parent.Errors.Sammlung) +local EntryError = require(script.Parent.Errors.Eintrag) local HttpService = game:GetService("HttpService") -- 2.47.2 From fe85632781343c0e666017d888e203b1243e8f14 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:36:43 +0200 Subject: [PATCH 12/19] Update MarcSyncv1.0.lua --- src/MarcSync/MarcSyncv1.0.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/MarcSync/MarcSyncv1.0.lua b/src/MarcSync/MarcSyncv1.0.lua index 5b3f06a..c8dab92 100644 --- a/src/MarcSync/MarcSyncv1.0.lua +++ b/src/MarcSync/MarcSyncv1.0.lua @@ -5,7 +5,7 @@ local tokens = { -- DO NOT EDIT THE FOLLOWING LINES BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING! -local Utils = require(script.Parent.Utils) +local Utils = require(script.Parent.Dienstprogramme) local MarcSyncClient = {} MarcSyncClient.bekommeVersion = function(self:typeof(MarcSyncClient), clientId: number?):string @@ -16,31 +16,31 @@ MarcSyncClient.bekommeVersion = function(self:typeof(MarcSyncClient), clientId: return result["version"] end -MarcSyncClient.erzeugeKollektion = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) +MarcSyncClient.erzeugeSammlung = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Sammlung).new()) if not self._accessToken then error("[MarkSynchronisation] Bitte legen Sie ein Token fest, bevor Sie MarcSync verwenden.") end if not collectionName then error("Kein CollectionName angegeben") end local result = Utils.macheHypertexttransferprotokollAnfrage("collection", "POST", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end - result = require(script.Parent.Objects.Collection).neu(collectionName, self._accessToken) + result = require(script.Parent.Objects.Sammlung).neu(collectionName, self._accessToken) return result end -MarcSyncClient.bringeKollektion = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) +MarcSyncClient.bringeSammlung = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Sammlung).new()) self:_checkInstallation() if not collectionName then error("Kein CollectionName angegeben") end local result = Utils.macheHypertexttransferprotokollAnfrage("collection", "GET", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken); if not result["success"] then error(result["errorMessage"]) end - result = require(script.Parent.Objects.Collection).neu(collectionName, self._accessToken) + result = require(script.Parent.Objects.Sammlung).neu(collectionName, self._accessToken) return result end -MarcSyncClient.bekommeKollektion = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection).new()) +MarcSyncClient.bekommeSammlung = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Sammlung).new()) if typeof(self) ~= "table" then error("Bitte verwenden Sie : anstelle von .") end self:_checkInstallation() if not collectionName then error("Kein CollectionName angegeben") end - return require(script.Parent.Objects.Collection).neu(collectionName, self._accessToken) + return require(script.Parent.Objects.Sammlung).neu(collectionName, self._accessToken) end return { -- 2.47.2 From 514ac3db6171af49d77e2455a7c7e77aef8af43f Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:38:30 +0200 Subject: [PATCH 13/19] Rename EntryData.lua to EintragsDaten.lua --- src/MarcSync/Types/{EntryData.lua => EintragsDaten.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/MarcSync/Types/{EntryData.lua => EintragsDaten.lua} (100%) diff --git a/src/MarcSync/Types/EntryData.lua b/src/MarcSync/Types/EintragsDaten.lua similarity index 100% rename from src/MarcSync/Types/EntryData.lua rename to src/MarcSync/Types/EintragsDaten.lua -- 2.47.2 From 633963490fd0f86268d571c8cb3a99a57bbc15bf Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:39:44 +0200 Subject: [PATCH 14/19] Update Collection.lua --- src/MarcSync/Objects/Collection.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MarcSync/Objects/Collection.lua b/src/MarcSync/Objects/Collection.lua index 7c8efc8..51a515a 100644 --- a/src/MarcSync/Objects/Collection.lua +++ b/src/MarcSync/Objects/Collection.lua @@ -1,8 +1,8 @@ -local Utils = require(script.Parent.Parent.Utils) -local Entry = require(script.Parent.Entry) +local Utils = require(script.Parent.Parent.Dienstprogramme) +local Entry = require(script.Parent.Eintrag) local types = { - EntryData = require(script.Parent.Parent.Types.EntryData).bekommeRassenindentifikationsspezifizierunginstanztextaufzaehlbar() + EntryData = require(script.Parent.Parent.Types.EintragsDaten).bekommeRassenindentifikationsspezifizierunginstanztextaufzaehlbar() } local Collection = {} -- 2.47.2 From 7fe48498794ead5fef410343e03eef6885b109a3 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:40:55 +0200 Subject: [PATCH 15/19] Rename Collection.lua to Sammlung.lua --- src/MarcSync/Objects/{Collection.lua => Sammlung.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/MarcSync/Objects/{Collection.lua => Sammlung.lua} (100%) diff --git a/src/MarcSync/Objects/Collection.lua b/src/MarcSync/Objects/Sammlung.lua similarity index 100% rename from src/MarcSync/Objects/Collection.lua rename to src/MarcSync/Objects/Sammlung.lua -- 2.47.2 From a2af160002134207109a6aa834b3b3082ef32f2a Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:41:34 +0200 Subject: [PATCH 16/19] Update and rename Entry.lua to Eintrag.lua --- src/MarcSync/Objects/{Entry.lua => Eintrag.lua} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/MarcSync/Objects/{Entry.lua => Eintrag.lua} (96%) diff --git a/src/MarcSync/Objects/Entry.lua b/src/MarcSync/Objects/Eintrag.lua similarity index 96% rename from src/MarcSync/Objects/Entry.lua rename to src/MarcSync/Objects/Eintrag.lua index f3ca5ff..e37307d 100644 --- a/src/MarcSync/Objects/Entry.lua +++ b/src/MarcSync/Objects/Eintrag.lua @@ -1,4 +1,4 @@ -local Utils = require(script.Parent.Parent.Utils) +local Utils = require(script.Parent.Parent.Dienstprogramme) local types = { EntryData = require(script.Parent.Parent.Types.EntryData).bekommeRassenindentifikationsspezifizierunginstanztextaufzaehlbar() -- 2.47.2 From 08e00eb7a602e803715cf188cc3f9de204645d44 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:41:52 +0200 Subject: [PATCH 17/19] Rename Authorization.lua to Autorisierung.lua --- src/MarcSync/Errors/{Authorization.lua => Autorisierung.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/MarcSync/Errors/{Authorization.lua => Autorisierung.lua} (100%) diff --git a/src/MarcSync/Errors/Authorization.lua b/src/MarcSync/Errors/Autorisierung.lua similarity index 100% rename from src/MarcSync/Errors/Authorization.lua rename to src/MarcSync/Errors/Autorisierung.lua -- 2.47.2 From d3771ce10bc964bd2acb443edd16af99695a7282 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:42:03 +0200 Subject: [PATCH 18/19] Rename Collection.lua to Sammlung.lua --- src/MarcSync/Errors/{Collection.lua => Sammlung.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/MarcSync/Errors/{Collection.lua => Sammlung.lua} (100%) diff --git a/src/MarcSync/Errors/Collection.lua b/src/MarcSync/Errors/Sammlung.lua similarity index 100% rename from src/MarcSync/Errors/Collection.lua rename to src/MarcSync/Errors/Sammlung.lua -- 2.47.2 From db262bb9ff5d42ade5d3b105a16a29c7470c2ae3 Mon Sep 17 00:00:00 2001 From: IBims2CooleTim <116311836+IBims2CooleTim@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:42:21 +0200 Subject: [PATCH 19/19] Rename Entry.lua to Eintrag.lua --- src/MarcSync/Errors/{Entry.lua => Eintrag.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/MarcSync/Errors/{Entry.lua => Eintrag.lua} (100%) diff --git a/src/MarcSync/Errors/Entry.lua b/src/MarcSync/Errors/Eintrag.lua similarity index 100% rename from src/MarcSync/Errors/Entry.lua rename to src/MarcSync/Errors/Eintrag.lua -- 2.47.2