diff options
| -rw-r--r-- | auth/config/donmai.zsh | 2 | ||||
| -rw-r--r-- | auth/config/gelbooru.zsh | 1 | ||||
| -rw-r--r-- | auth/config/moebooru.zsh | 2 | ||||
| -rw-r--r-- | auth/config/sankakucomplex.zsh | 2 | ||||
| -rw-r--r-- | config/donmai.zsh | 2 | ||||
| -rw-r--r-- | config/gelbooru.zsh | 1 | ||||
| -rw-r--r-- | config/moebooru.zsh | 2 | ||||
| -rw-r--r-- | config/sankakucomplex.zsh | 2 | ||||
| -rw-r--r-- | operators/command_authorize.zsh | 1 | ||||
| -rw-r--r-- | units/ib_authconfig.zsh | 9 |
10 files changed, 11 insertions, 13 deletions
diff --git a/auth/config/donmai.zsh b/auth/config/donmai.zsh index fec7316..e3f5c77 100644 --- a/auth/config/donmai.zsh +++ b/auth/config/donmai.zsh @@ -5,9 +5,11 @@ 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 diff --git a/auth/config/gelbooru.zsh b/auth/config/gelbooru.zsh index 7cb059d..6637c67 100644 --- a/auth/config/gelbooru.zsh +++ b/auth/config/gelbooru.zsh @@ -4,6 +4,7 @@ ib_auth=0 ib_raw=0 +ib_config="gelbooru" ib_login_file="user_id" ib_key_file="api_key" ib_login_word="user ID" diff --git a/auth/config/moebooru.zsh b/auth/config/moebooru.zsh index 7319352..1143298 100644 --- a/auth/config/moebooru.zsh +++ b/auth/config/moebooru.zsh @@ -5,9 +5,11 @@ case "${ib_board}" in (k) ib_auth="https://konachan.com" + ib_config="konachan" ;; (y) ib_auth="https://yande.re" + ib_config="yandere" ;; esac diff --git a/auth/config/sankakucomplex.zsh b/auth/config/sankakucomplex.zsh index a34318f..808b840 100644 --- a/auth/config/sankakucomplex.zsh +++ b/auth/config/sankakucomplex.zsh @@ -5,9 +5,11 @@ case "${ib_board}" in (i) ib_auth="https://i.sankakuapi.com" + ib_config="idolcomplex" ;; (s) ib_auth="https://sankakuapi.com" + ib_config="sankakuchannel" ;; esac diff --git a/config/donmai.zsh b/config/donmai.zsh index f025e17..76a07cf 100644 --- a/config/donmai.zsh +++ b/config/donmai.zsh @@ -7,13 +7,11 @@ ib_cname="donmai" case "${ib_board}" in (a) ib_name="Safebooru" - ib_config="safebooru" ib_api="https://safebooru.donmai.us" ib_url="https://safebooru.donmai.us" ;; (d) ib_name="Danbooru" - ib_config="danbooru" ib_api="https://danbooru.donmai.us" ib_url="https://danbooru.donmai.us" ;; diff --git a/config/gelbooru.zsh b/config/gelbooru.zsh index 4c495dc..129996c 100644 --- a/config/gelbooru.zsh +++ b/config/gelbooru.zsh @@ -5,7 +5,6 @@ ib_cname="gelbooru" ib_name="Gelbooru" -ib_config="gelbooru" ib_api="https://gelbooru.com" ib_url="https://gelbooru.com" diff --git a/config/moebooru.zsh b/config/moebooru.zsh index 2327e2b..fe23be1 100644 --- a/config/moebooru.zsh +++ b/config/moebooru.zsh @@ -7,13 +7,11 @@ ib_cname="moebooru" case "${ib_board}" in (k) ib_name="Konachan.com" - ib_config="konachan" ib_api="https://konachan.com" ib_url="https://konachan.com" ;; (y) ib_name="yande.re" - ib_config="yandere" ib_api="https://yande.re" ib_url="https://yande.re" ;; diff --git a/config/sankakucomplex.zsh b/config/sankakucomplex.zsh index 6452c93..bb8cc22 100644 --- a/config/sankakucomplex.zsh +++ b/config/sankakucomplex.zsh @@ -7,7 +7,6 @@ ib_cname="sankakucomplex" case "${ib_board}" in (i) ib_name="Idol Complex" - ib_config="idolcomplex" ib_api="https://i.sankakuapi.com" ib_url="https://www.idolcomplex.com" @@ -25,7 +24,6 @@ case "${ib_board}" in ;; (s) ib_name="Sankaku Channel" - ib_config="sankakuchannel" ib_api="https://sankakuapi.com" ib_url="https://www.sankakucomplex.com" diff --git a/operators/command_authorize.zsh b/operators/command_authorize.zsh index a8be540..e4af58d 100644 --- a/operators/command_authorize.zsh +++ b/operators/command_authorize.zsh @@ -5,7 +5,6 @@ if [[ -n "${1}" ]] then ib_board="${1}" - source "${units}/ib_config.zsh" source "${units}/ib_authconfig.zsh" if [[ -z "${ib_auth}" ]] diff --git a/units/ib_authconfig.zsh b/units/ib_authconfig.zsh index ed57894..c94206d 100644 --- a/units/ib_authconfig.zsh +++ b/units/ib_authconfig.zsh @@ -2,11 +2,6 @@ # Copyright (C) 2024-2026 Danil Lisin # SPDX-License-Identifier: Apache-2.0 -auth_dir="${user_config}/${ib_config}" - -timestamp_file="${auth_dir}/timestamp" -token_file="${auth_dir}/token" - case "${ib_board}" in (a|d) source "${auth}/config/donmai.zsh" @@ -22,5 +17,9 @@ case "${ib_board}" in ;; esac +auth_dir="${user_config}/${ib_config}" + +timestamp_file="${auth_dir}/timestamp" +token_file="${auth_dir}/token" login_file="${auth_dir}/${ib_login_file}" key_file="${auth_dir}/${ib_key_file}" |