IDSolutions/client
2
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 28 Wiki Activity

Refactor: Organization Store and Leave Function Updates
Some checks failed
Build / Build (push) Failing after 11s
Details

Browse Source 
This commit refactors the organization store initialization and the leave function.

*   **Organization Store:** Changes the way the organization store is initialized by using a declaration array.
*   **Leave Function:** Improves the leave function by correcting a conditional statement to ensure proper handling of organization keys.
This commit is contained in:
Jacob Schmidt 2025-03-28 09:51:48 -05:00
parent 63df0b75dc
commit cf9bf922f1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/org/functions/fnc_initOrgStore.sqf
View File

@ -14,7 +14,7 @@
* Organization interface <OBJECT> * Organization interface <OBJECT>
*/ */
private _orgStoreInterface = createHashMapObject [[ private _orgStoreDeclaration = [
["#type", "IOrganizationStore"], ["#type", "IOrganizationStore"],
["#create", { ["#create", {
private _store = GETMVAR(FORGE_STORE_REG,nil); private _store = GETMVAR(FORGE_STORE_REG,nil);
@ -103,7 +103,7 @@ private _orgStoreInterface = createHashMapObject [[
private _store = GETMVAR(FORGE_STORE_REG,nil); private _store = GETMVAR(FORGE_STORE_REG,nil);
private _org = _store call ["get", ["organizations", _key]] private _org = _store call ["get", ["organizations", _key]]
if (isNil "_org") exitWith { ERROR_MSG_1("Organization with composite key %1 not found", _key); nil }; if (isNil "_org") exitWith { ERROR_MSG_1("Organization with composite key %1 not found",_key); nil };
_org _org
}], }],
@ -117,7 +117,7 @@ private _orgStoreInterface = createHashMapObject [[
_store call ["delete", ["organizationNameIndex", _key]]; _store call ["delete", ["organizationNameIndex", _key]];
if (isNil "_key") exitWith { ERROR_MSG_1("Key for organization not found", _key); false }; if (isNil "_key") exitWith { ERROR_MSG_1("Key for organization not found",_key); false };
_store call ["delete", ["organizations", _key]]; _store call ["delete", ["organizations", _key]];
@ -128,7 +128,8 @@ private _orgStoreInterface = createHashMapObject [[
true true
}] }]
]]; ];
private _orgStoreInterface = createHashMapObject [_orgStoreDeclaration];
SETMVAR(FORGE_ORG_STORE_REG,_orgStoreInterface); SETMVAR(FORGE_ORG_STORE_REG,_orgStoreInterface);
GETMVAR(FORGE_ORG_STORE_REG,nil) GETMVAR(FORGE_ORG_STORE_REG,nil)

2
addons/org/functions/fnc_leave.sqf
View File

@ -28,7 +28,7 @@ private _org = _store call ["getByKey", [_key]];
private _timestamp = systemTimeUTC apply { if (_x < 10) then { "0" + str _x } else { str _x }}; private _timestamp = systemTimeUTC apply { if (_x < 10) then { "0" + str _x } else { str _x }};
private _dateTime = format ["%1-%2-%3_%4:%5:%6.%7", _timestamp#0, _timestamp#1, _timestamp#2, _timestamp#3, _timestamp#4, _timestamp#5, _timestamp#6]; private _dateTime = format ["%1-%2-%3_%4:%5:%6.%7", _timestamp#0, _timestamp#1, _timestamp#2, _timestamp#3, _timestamp#4, _timestamp#5, _timestamp#6];
if (isNil "_org") exitWith { TRACE_1("Organization not found", _key); false }; if (isNil "_org") exitWith { TRACE_1("Organization not found",_key); false };
private _members = _org get "members"; private _members = _org get "members";
private _logs = _org get "logs"; private _logs = _org get "logs";