units: Merge ib_authconfig and ib_config

Signed-off-by: Maria Lisina <sekoohaka.sarisan@gmail.com>

5 files changed, 13 insertions, 33 deletions

diff --git a/units/ib_authconfig.zsh b/units/ib_authconfig.zsh
deleted file mode 100644
index fd40f96..0000000
--- a/units/ib_authconfig.zsh
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-case "${ib_board}" in
-    (a|d)
-        source "${auth}/config/donmai.zsh"
-    ;;
-    (i|s)
-        source "${auth}/config/sankakucomplex.zsh"
-    ;;
-    (k|y)
-        source "${auth}/config/moebooru.zsh"
-    ;;
-esac
-
-auth_dir="${user_config}/${ib_config}"
-
-if ! [[ -d "${auth_dir}" || -z "${ib_mode}" ]]
-then
-    user_config="${default_user_config}"
-    auth_dir="${user_config}/${ib_config}"
-fi
-
-timestamp_file="${auth_dir}/timestamp"
-token_file="${auth_dir}/token"
-login_file="${auth_dir}/${ib_login_file}"
-key_file="${auth_dir}/${ib_key_file}"
diff --git a/units/ib_common.zsh b/units/ib_common.zsh
index 5c0b9a3..9e4307c 100644
--- a/units/ib_common.zsh
+++ b/units/ib_common.zsh
@@ -8,7 +8,6 @@ then
     ib_mode="p"
 
     source "${units}/ib_config.zsh"
-    source "${units}/ib_authconfig.zsh"
 
     if [[ -z "${ib_data_url}" ]]
     then
diff --git a/units/ib_config.zsh b/units/ib_config.zsh
index 8270fb5..d6b4faa 100644
--- a/units/ib_config.zsh
+++ b/units/ib_config.zsh
@@ -17,3 +17,16 @@ case "${ib_board}" in
         source "${config}/moebooru.zsh"
     ;;
 esac
+
+auth_dir="${user_config}/${ib_config}"
+
+if ! [[ -d "${auth_dir}" || -z "${ib_mode}" ]]
+then
+    user_config="${default_user_config}"
+    auth_dir="${user_config}/${ib_config}"
+fi
+
+timestamp_file="${auth_dir}/timestamp"
+token_file="${auth_dir}/token"
+login_file="${auth_dir}/${ib_login_file}"
+key_file="${auth_dir}/${ib_key_file}"
diff --git a/units/ib_hash.zsh b/units/ib_hash.zsh
index 3e14a19..66c6b03 100644
--- a/units/ib_hash.zsh
+++ b/units/ib_hash.zsh
@@ -8,8 +8,6 @@ ib_board="${board_table[1]}"
 ib_mode="p"
 
 source "${units}/ib_config.zsh"
-source "${units}/ib_authconfig.zsh"
-
 ib_query="md5:${ib_post_md5}"
 
 ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
diff --git a/units/ib_search.zsh b/units/ib_search.zsh
index af6ec74..5ba11c9 100644
--- a/units/ib_search.zsh
+++ b/units/ib_search.zsh
@@ -5,9 +5,7 @@
 if [[ -n "${1}" ]]
 then
     ib_board="${1}"
-
     source "${units}/ib_config.zsh"
-    source "${units}/ib_authconfig.zsh"
 
     if [[ -z "${ib_data_url}" ]]
     then