units: Merge ib_authconfig and ib_config

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

13 files changed, 44 insertions, 96 deletions

diff --git a/auth/config/donmai.zsh b/auth/config/donmai.zsh
deleted file mode 100644
index e3f5c77..0000000
--- a/auth/config/donmai.zsh
+++ /dev/null
@@ -1,20 +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)
-        ib_auth="https://safebooru.donmai.us"
-        ib_config="safebooru"
-    ;;
-    (d)
-        ib_auth="https://danbooru.donmai.us"
-        ib_config="danbooru"
-    ;;
-esac
-
-ib_header="Authorization: Baisc"
-ib_login_file="login"
-ib_key_file="api_key"
-ib_login_word="login"
-ib_key_word="API key"
diff --git a/auth/config/moebooru.zsh b/auth/config/moebooru.zsh
deleted file mode 100644
index 1143298..0000000
--- a/auth/config/moebooru.zsh
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-case "${ib_board}" in
-    (k)
-        ib_auth="https://konachan.com"
-        ib_config="konachan"
-    ;;
-    (y)
-        ib_auth="https://yande.re"
-        ib_config="yandere"
-    ;;
-esac
-
-ib_raw=0
-ib_login_file="username"
-ib_key_file="api_key"
-ib_login_word="username"
-ib_key_word="API key"
diff --git a/auth/config/sankakucomplex.zsh b/auth/config/sankakucomplex.zsh
deleted file mode 100644
index 808b840..0000000
--- a/auth/config/sankakucomplex.zsh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2024-2026 Maria Lisina
-# Copyright (C) 2024-2026 Danil Lisin
-# SPDX-License-Identifier: Apache-2.0
-
-case "${ib_board}" in
-    (i)
-        ib_auth="https://i.sankakuapi.com"
-        ib_config="idolcomplex"
-    ;;
-    (s)
-        ib_auth="https://sankakuapi.com"
-        ib_config="sankakuchannel"
-    ;;
-esac
-
-ib_header="Authorization: Bearer"
-ib_expire=86400
-ib_login_file="login"
-ib_key_file="password"
-ib_login_word="login"
-ib_key_word="password"
diff --git a/config/donmai.zsh b/config/donmai.zsh
index 24e3694..780a32e 100644
--- a/config/donmai.zsh
+++ b/config/donmai.zsh
@@ -4,15 +4,25 @@
 
 ib_cname="donmai"
 
+ib_header="Authorization: Baisc"
+ib_login_file="login"
+ib_key_file="api_key"
+ib_login_word="login"
+ib_key_word="API key"
+
 case "${ib_board}" in
     (a)
         ib_name="Safebooru"
+        ib_config="safebooru"
         ib_api="https://safebooru.donmai.us"
+        ib_auth="https://safebooru.donmai.us"
         ib_url="https://safebooru.donmai.us"
     ;;
     (d)
         ib_name="Danbooru"
+        ib_config="danbooru"
         ib_api="https://danbooru.donmai.us"
+        ib_auth="https://danbooru.donmai.us"
         ib_url="https://danbooru.donmai.us"
     ;;
 esac
diff --git a/config/moebooru.zsh b/config/moebooru.zsh
index f0c38df..d34cc8c 100644
--- a/config/moebooru.zsh
+++ b/config/moebooru.zsh
@@ -4,15 +4,25 @@
 
 ib_cname="moebooru"
 
+ib_raw=0
+ib_login_file="username"
+ib_key_file="api_key"
+ib_login_word="username"
+ib_key_word="API key"
+
 case "${ib_board}" in
     (k)
         ib_name="Konachan"
+        ib_config="konachan"
         ib_api="https://konachan.com"
+        ib_auth="https://konachan.com"
         ib_url="https://konachan.com"
     ;;
     (y)
         ib_name="Yandere"
+        ib_config="yandere"
         ib_api="https://yande.re"
+        ib_auth="https://yande.re"
         ib_url="https://yande.re"
     ;;
 esac
diff --git a/config/sankakucomplex.zsh b/config/sankakucomplex.zsh
index 122a607..7326034 100644
--- a/config/sankakucomplex.zsh
+++ b/config/sankakucomplex.zsh
@@ -4,10 +4,19 @@
 
 ib_cname="sankakucomplex"
 
+ib_header="Authorization: Bearer"
+ib_expire=86400
+ib_login_file="login"
+ib_key_file="password"
+ib_login_word="login"
+ib_key_word="password"
+
 case "${ib_board}" in
     (i)
         ib_name="Idol Complex"
+        ib_config="idolcomplex"
         ib_api="https://i.sankakuapi.com"
+        ib_auth="https://i.sankakuapi.com"
         ib_url="https://www.idolcomplex.com"
 
         ib_groups=(
@@ -24,7 +33,9 @@ case "${ib_board}" in
     ;;
     (s)
         ib_name="Sankaku Channel"
+        ib_config="sankakuchannel"
         ib_api="https://sankakuapi.com"
+        ib_auth="https://sankakuapi.com"
         ib_url="https://www.sankakucomplex.com"
 
         ib_groups=(
diff --git a/operators/command_authorize.zsh b/operators/command_authorize.zsh
index a8be540..41c8ecd 100644
--- a/operators/command_authorize.zsh
+++ b/operators/command_authorize.zsh
@@ -6,7 +6,6 @@ if [[ -n "${1}" ]]
 then
     ib_board="${1}"
     source "${units}/ib_config.zsh"
-    source "${units}/ib_authconfig.zsh"
 
     if [[ -z "${ib_auth}" ]]
     then
diff --git a/operators/url_parser.zsh b/operators/url_parser.zsh
index f18542a..1ee4d0d 100644
--- a/operators/url_parser.zsh
+++ b/operators/url_parser.zsh
@@ -40,7 +40,6 @@ then
 fi
 
 source "${units}/ib_config.zsh"
-source "${units}/ib_authconfig.zsh"
 
 if [[ ${#ib_post_id} -gt 32 ]]
 then
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