mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-09-21 17:04:00 +00:00
Address review on the role api
- Roles are objects and everything done to or with a role is a method on it: assign, unassign, has_player, has_permission, is_higher_than, is_lower_than, get_players, get_player_names, print. Assignment has one entry point, role:assign(player, options), with local_only as an option rather than a second function. - Roles are looked up by clusterio id with get_role; get_role_by_name searches the list for the few places, such as configs, which only know a name. The name map and the ordered list are gone, get_roles sorts on demand and the index field is replaced by the comparison methods. - Players are LuaPlayer objects only, with nil or index 0 for the server. - get_higher_roles and get_lower_roles replace print_to_roles_higher and print_to_roles_lower, call sites loop over them with role:print. - Permission groups are removed from roles again, exp_groups owns the mapping from roles to groups. - Seeding is a SeedRolesRequest behind a button on the roles page rather than running on first start, and creates only the roles; the player assignments are dropped. The seed lists each permission once at the lowest role which has it and lets the parent chain carry it up. - System commands unlock for core.admin rather than a permission of their own. - Role metatables are registered with Storage.register_metatable so the methods survive save and load, which the role records in storage needed. - The player list auth uses Roles.player_outranks directly, and the event carries role ids rather than names. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
78a533a6f6
commit
bea8d46c82
+12
-11
@@ -51,11 +51,6 @@ export class RoleMetaRecord {
|
||||
public tag: string = "",
|
||||
/** Colour used for the role in game, null uses the default colour. */
|
||||
public color: RoleColor | null = null,
|
||||
/**
|
||||
* Factorio permission group players are moved into while this is their
|
||||
* most privileged role which names one, empty leaves the group alone.
|
||||
*/
|
||||
public permissionGroup: string = "",
|
||||
/** Online time after which this role is granted, null never grants it. */
|
||||
public autoAssignOnlineTimeMs: number | null = null,
|
||||
/** When true holders of this role are never granted roles automatically. */
|
||||
@@ -71,7 +66,6 @@ export class RoleMetaRecord {
|
||||
short_hand: Type.Optional(Type.String()),
|
||||
tag: Type.Optional(Type.String()),
|
||||
color: Type.Optional(Type.Union([RoleColor.jsonSchema, Type.Null()])),
|
||||
permission_group: Type.Optional(Type.String()),
|
||||
auto_assign_online_time_ms: Type.Optional(Type.Union([Type.Number(), Type.Null()])),
|
||||
block_auto_assign: Type.Optional(Type.Boolean()),
|
||||
updated_at_ms: Type.Optional(Type.Number()),
|
||||
@@ -100,10 +94,6 @@ export class RoleMetaRecord {
|
||||
json.color = this.color.toJSON();
|
||||
}
|
||||
|
||||
if (this.permissionGroup) {
|
||||
json.permission_group = this.permissionGroup;
|
||||
}
|
||||
|
||||
if (this.autoAssignOnlineTimeMs !== null) {
|
||||
json.auto_assign_online_time_ms = this.autoAssignOnlineTimeMs;
|
||||
}
|
||||
@@ -131,7 +121,6 @@ export class RoleMetaRecord {
|
||||
json.short_hand ?? "",
|
||||
json.tag ?? "",
|
||||
json.color ? RoleColor.fromJSON(json.color) : null,
|
||||
json.permission_group ?? "",
|
||||
json.auto_assign_online_time_ms ?? null,
|
||||
json.block_auto_assign ?? false,
|
||||
json.updated_at_ms ?? 0,
|
||||
@@ -376,6 +365,18 @@ export class RoleMetaUpdateRequest {
|
||||
}
|
||||
}
|
||||
|
||||
/** Create the roles the scenario shipped with, see seed.ts. */
|
||||
export class SeedRolesRequest {
|
||||
declare ["constructor"]: typeof SeedRolesRequest;
|
||||
static plugin = "exp_roles" as const;
|
||||
static type = "request" as const;
|
||||
static src = "control" as const;
|
||||
static dst = "controller" as const;
|
||||
static permission = "core.role.create" as const;
|
||||
|
||||
constructor() {}
|
||||
}
|
||||
|
||||
/*
|
||||
Assignment requests
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user