From eff8910cd3f67b2b8dbbe5746e5d3bd535779d13 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Sun, 21 May 2023 09:54:50 -0500 Subject: [PATCH] Add global user-states (user-enable-state!, etc) --- chatdir.scm | 33 +++++++++++++++++++++++++++++++-- tests/tests.scm | 7 +++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/chatdir.scm b/chatdir.scm index 53dcb7e..3bc7de9 100644 --- a/chatdir.scm +++ b/chatdir.scm @@ -106,7 +106,7 @@ (create-symbolic-link (subpath "../../../.users" g-name) user-path) (create-directory user-path #t)) (create-symbolic-link (subpath "../../../../.users" g-name) - (subpath user-path "global")) + (subpath user-path "global")) (create-symbolic-link (subpath "../../../" channel ".users" "all" username) (subpath g-user-path "local" channel))] ;; This is a channel-only user, don't bother with symlink fanciness. @@ -156,7 +156,6 @@ (create-directory (subpath root channel ".users" state) #t)] [user-path (subpath ".." "all" username)] [state-link (subpath state-path username)]) - (print state-path) (if (not (or (file-exists? state-link) (symbolic-link? state-link))) (create-symbolic-link user-path @@ -169,6 +168,32 @@ (channel-user-enable-state! root channel username enabled-state)) +;; Enables a user's state (online/offline/etc), for all channels they are in. +(define (user-enable-state! root username state) + (map + (lambda (channel) + (channel-user-enable-state! root channel username state)) + (directory (subpath root ".users" username "local")))) + + +;; Disables a user's state (online/offline/etc), for all channels they are in. +(define (user-disable-state! root username state) + (map + (lambda (channel) + (channel-user-disable-state! root channel username state)) + (directory (subpath root ".users" username "local")))) + + +;; Ensures the enabled-state is enabled, and it's opposite (disabled-state) is not, +;; for all channels the given user is in. +(define (user-toggle-states! root username enabled-state disabled-state) + (map + (lambda (channel) + (channel-user-toggle-states! root channel username + enabled-state disabled-state)) + (directory (subpath root ".users" username "local")))) + + (define (write-string-to-file file value) (call-with-output-file file (lambda (out-port) @@ -391,3 +416,7 @@ (input-loop root-dir callbacks-alist)) + +;; Repeat after me: +;; 🎵 Symbolic links cannot have extended attributes, and that is a war-crime. 🎶 +;; 🎵 Directories cannot have extended attributes, and that is a war-crime. 🎶 diff --git a/tests/tests.scm b/tests/tests.scm index cffcc13..cb03089 100644 --- a/tests/tests.scm +++ b/tests/tests.scm @@ -175,6 +175,7 @@ ;; Check a room user-directory with corresponding global user-directory, ;; but without the above link/pairity. +(channel-user-add! *dir* *room* "mawa" #t #f) (channel-user-add! *dir* *new-room* "mawa" #t #f) (channel-user-file-set! *dir* *new-room* "mawa" "nick" "mawarth") (user-file-set! *dir* "mawa" "nick" "magma") @@ -210,6 +211,12 @@ => #f) +(user-enable-state! *dir* "mawa" "online") +(check (list (symbolic-link? (subpath *new-room-users* "online" "mawa")) + (symbolic-link? (subpath *dir* *room* ".users" "online" "mawa"))) + => + '(#t #t)) + ;; —————————————————————————————————————————————————— (check-report)