- [fediverse] added command line switch to choose to use a specific fediverse account (if specified in the configuration file);

- [TUI] anticipated the showing of the welcome script to appears before the fediverse account authorization.

src/command-line.lisp

@@ -89,6 +89,11 @@
        :meta-var                  (_ "MODULE-FILE")
        :arg-parser                #'identity
        :long                      "load-module")
+      (:name :fediverse-account
+       :description               (_ "Specify a fediverse user account (format: user-name@server-name).")
+       :meta-var                  (_ "FEDIVERSE-ACCOUNT")
+       :arg-parser                #'identity
+       :long                      "fediverse-account")
       (:name :print-lisp-dependencies
        :description               (_ "Download lisp libraries (useful for packaging only).")
        :short                     #\X
@@ -133,6 +138,8 @@
 
 (defparameter *start-dummy-server*                 nil)
 
+(defparameter *fediverse-account*                  nil)
+
 (defun exit-on-error (e)
   (format *error-output* "~a~%" e)
   (os-utils:exit-program 1))
@@ -177,6 +184,11 @@
                   (write-shell-array options)))
             (write-shell-array options))))))
 
+(defun fediverse-account-parameters ()
+  (when-let ((splitted (cl-ppcre:split "@" *fediverse-account*)))
+    (values (elt splitted 0)
+            (elt splitted 1))))
+
 (defun manage-opts ()
   (handler-bind ((opts:unknown-option          #'exit-on-error)
                  (opts:missing-arg             #'exit-on-error)
@@ -204,6 +216,7 @@
       (set-option-variable options :update-timeline            *update-timeline*)
       (set-option-variable options :execute                    *script-file*)
       (set-option-variable options :load-module                *module-file*)
+      (set-option-variable options :fediverse-account          *fediverse-account*)
       (set-option-variable options :check-follows-requests     *check-follow-requests*)
       (set-option-variable options :gemini-full-screen-mode    *gemini-full-screen-mode*)
       (set-option-variable options :notify-mentions            *notify-mentions*)

src/db-utils.lisp

@@ -227,23 +227,34 @@ example:
                                    (from table)))))
         :ct))
 
-(defun db-current-file-name ()
+(defun db-file-name (username server-name)
   (concatenate 'string
-               (swconf:current-username)
+               username
                "@"
-               (swconf:current-server-name)
+               server-name
                "."
                +db-file-extension+))
 
-(defun db-path ()
+(defun db-current-file-name ()
+  (db-file-name (swconf:current-username)
+                (swconf:current-server-name)))
+
+(defun db-path (&optional (file-name (db-current-file-name)))
   (uiop:unix-namestring (concatenate 'string
                                      (res:home-datadir)
                                      "/"
-                                     (db-current-file-name))))
+                                     file-name)))
 
 (defun db-file-exists-p ()
   (fs:file-exists-p (db-path)))
 
+(defun a-database-file-exists-p (usernames server-names)
+  (loop for username in usernames
+        for server-name in server-names do
+          (when (fs:file-exists-p (db-path (db-file-name username server-name)))
+            (return-from a-database-file-exists-p t)))
+  nil)
+
 (defun init-connection ()
   "Initialize a db connection (and create db file if does not exists)"
   (when (not (db-file-exists-p))

src/main.lisp

@@ -125,9 +125,11 @@ etc.) happened"
       (format *error-output* "~a~%" e)
       (os-utils:exit-program 1)))
   (handler-case
-      (progn
+      (multiple-value-bind (command-line-username command-line-server-name)
+          (command-line:fediverse-account-parameters)
         (swconf:load-config-file swconf:+conf-filename+ t)
-        (swconf:set-current-username-and-server))
+        (swconf:set-current-username-and-server command-line-username
+                                                command-line-server-name))
     (error (e)
       (format *error-output*
               (_ "Configuration error~%~a~%Tinmop will create  an empty file for you in ~a (if such file does not exists). This file will be enough to use the program as a gemini client but to connect to pleroma the file must be properly filled.~2%Consult the manpage ~a(1) for more details.~2%If you already wrote a configuration file, check the error printed below, try to fix the configuration file and restart ~a.~%")
@@ -138,10 +140,11 @@ etc.) happened"
       (res:create-empty-file-in-home swconf:+conf-filename+)
       (os-utils:exit-program 1))))
 
-(defun shared-init (&key (verbose t))
+(defun shared-init (&key (verbose t) (initialize-database t))
   (num:lcg-set-seed)
   (load-configuration-files :verbose verbose)
-  (init-db))
+  (when initialize-database
+    (init-db)))
 
 (defun rpc-server-init ()
   "Initialize the program"
@@ -155,9 +158,8 @@ etc.) happened"
                   command-line:*module-file*))))
     (json-rpc-communication:start-server)))
 
-(defun tui-init ()
+(defun tui-init (draw-welcome-window)
   "Initialize the program"
-  (shared-init)
   (db-utils:with-ready-database (:connect nil)
     (complete:initialize-complete-username-cache)
     (let ((system-config-file-found-p (modules:load-sys-module +starting-init-file+
@@ -173,6 +175,8 @@ etc.) happened"
     (main-window:init)
     (keybindings-window:init)
     (command-window:init)
+    (when draw-welcome-window
+      (ui:show-welcome-window))
     (when (not command-line:*gemini-full-screen-mode*)
       (thread-window:init))
     ;; the size  of message  and tag  window depends  from the  sizes of
@@ -220,14 +224,12 @@ etc.) happened"
           (when command-line:*check-follow-requests*
             (ui:start-follow-request-processing))))))
 
-(defun run (draw-welcome-string)
+(defun run ()
   (windows:with-croatoan-window (croatoan-window specials:*main-window*)
     (setf (c:frame-rate croatoan-window) +fps+)
     (db-utils:with-ready-database (:connect nil)
       (unwind-protect
            (progn
-             (when draw-welcome-string
-               (ui:show-welcome-window))
              (hooks:run-hooks 'hooks:*before-main-loop*)
              (c:run-event-loop croatoan-window))
         (c:end-screen)))))
@@ -280,7 +282,11 @@ etc.) happened"
                                           (declare (ignore h))
                                           (c:end-screen)
                                           (print c))))
-
-       (tui-init)
-       (let ((first-time-starting (not (db-utils:db-file-exists-p))))
-         (run first-time-starting))))))
+       (shared-init :initialize-database nil)
+       (let* ((config-usernames    (swconf::config-username))
+              (config-server-names (swconf::config-server-name))
+              (first-time-starting (not (db-utils:a-database-file-exists-p config-usernames
+                                                                           config-server-names))))
+         (init-db)
+         (tui-init first-time-starting)
+         (run))))))

src/package.lisp

@@ -834,6 +834,7 @@
    :db-path
    :quote-symbol
    :db-file-exists-p
+   :a-database-file-exists-p
    :init-connection
    :with-ready-database
    :with-disabled-foreign
@@ -1572,6 +1573,7 @@
    :*start-dummy-server*
    :*rpc-server-mode*
    :*rpc-client-mode*
+   :fediverse-account-parameters
    :manage-opts))
 
 (defpackage :specials