diff options
| author | Maria Lisina <sekoohaka.sarisan@gmail.com> | 2025-06-23 05:36:25 +0500 |
|---|---|---|
| committer | Maria Lisina <sekoohaka.sarisan@gmail.com> | 2025-06-23 05:36:25 +0500 |
| commit | 762e4370a9d2d352a6ed43ec482af6354e281e9e (patch) | |
| tree | d3af87a4cf076b0cc8238d5afa52e840190f6240 | |
| parent | f5f6ba0f6e509c262dbae0ac195c8e645000a463 (diff) | |
*/*: Update long command substitution syntax
Signed-off-by: Maria Lisina <sekoohaka.sarisan@gmail.com>
| -rw-r--r-- | auth/sankakuchannel.zsh | 10 | ||||
| -rw-r--r-- | modules/commands.zsh | 8 | ||||
| -rw-r--r-- | submodules/callback_post.zsh | 29 | ||||
| -rw-r--r-- | submodules/callback_tags.zsh | 40 | ||||
| -rw-r--r-- | submodules/command_help.zsh | 6 | ||||
| -rw-r--r-- | submodules/command_original.zsh | 10 | ||||
| -rw-r--r-- | submodules/command_post.zsh | 29 | ||||
| -rw-r--r-- | submodules/command_short.zsh | 21 | ||||
| -rw-r--r-- | submodules/command_shorts.zsh | 14 | ||||
| -rw-r--r-- | submodules/command_source.zsh | 8 | ||||
| -rw-r--r-- | submodules/command_stop.zsh | 6 | ||||
| -rw-r--r-- | submodules/inline_donate.zsh | 14 | ||||
| -rw-r--r-- | submodules/inline_help.zsh | 14 | ||||
| -rw-r--r-- | submodules/inline_original.zsh | 55 | ||||
| -rw-r--r-- | submodules/inline_post.zsh | 47 | ||||
| -rw-r--r-- | submodules/inline_search.zsh | 14 | ||||
| -rw-r--r-- | submodules/inline_search_pools.zsh | 33 | ||||
| -rw-r--r-- | submodules/inline_search_posts.zsh | 93 | ||||
| -rw-r--r-- | submodules/inline_search_tags.zsh | 33 | ||||
| -rw-r--r-- | submodules/inline_short.zsh | 43 | ||||
| -rw-r--r-- | submodules/inline_shorts.zsh | 54 | ||||
| -rw-r--r-- | submodules/url_parser.zsh | 43 | ||||
| -rw-r--r-- | units/ib_size.zsh | 24 |
23 files changed, 380 insertions, 268 deletions
diff --git a/auth/sankakuchannel.zsh b/auth/sankakuchannel.zsh index 8425cc7..86010be 100644 --- a/auth/sankakuchannel.zsh +++ b/auth/sankakuchannel.zsh @@ -2,10 +2,12 @@ # Copyright (C) 2024-2025 Danil Lisin # SPDX-License-Identifier: Apache-2.0 -ib_login_data="$(jq --null-input --compact-output \ - --arg login "${ib_login}" \ - --arg password "${ib_key}" \ - '{"login": $login, "password": $password}')" +ib_login_data="$( + jq --null-input --compact-output \ + --arg login "${ib_login}" \ + --arg password "${ib_key}" \ + '{"login": $login, "password": $password}' +)" ib_auth_file="${cache}/${update_id}_token.json" dump+=(${ib_auth_file##*/}) diff --git a/modules/commands.zsh b/modules/commands.zsh index 3e553d2..fdfbb15 100644 --- a/modules/commands.zsh +++ b/modules/commands.zsh @@ -15,9 +15,11 @@ message_id="$(jq -r '.message.message_id' "${update}")" is_topic="$(jq -r '.message.is_topic_message' "${update}")" message_thread_id="$(jq -r '.message.message_thread_id' "${update}")" -reply_parameters="$(jq --null-input --compact-output \ - --arg message_id "${message_id}" \ - '{"message_id": $message_id, "allow_sending_without_reply": true}')" +reply_parameters="$( + jq --null-input --compact-output \ + --arg message_id "${message_id}" \ + '{"message_id": $message_id, "allow_sending_without_reply": true}' +)" . "${units}/user.zsh" set -- ${command_query[@]} diff --git a/submodules/callback_post.zsh b/submodules/callback_post.zsh index 78708f4..14ef701 100644 --- a/submodules/callback_post.zsh +++ b/submodules/callback_post.zsh @@ -12,25 +12,32 @@ fi . "${units}/ib_post.zsh" -link_preview_options="$(jq --null-input --compact-output \ - --arg url "${ib_sample_url}" \ - '{"url": $url, "prefer_small_media": true, "show_above_text": true}')" +link_preview_options="$( + jq --null-input --compact-output \ + --arg url "${ib_sample_url}" \ + '{"url": $url, "prefer_small_media": true, "show_above_text": true}' +)" keyboard_text1="Post link" keyboard_url1="${ib_url}$(printf "%s" "${ib_post_id}" | urlencode)" -reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - '{"inline_keyboard": [[{"text": $text1, "url": $url1}]]}')" +reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + '{"inline_keyboard": [[{"text": $text1, "url": $url1}]]}' +)" if [[ ${#ib_tags} -gt 0 ]] then keyboard_text1="Tags (${#ib_tags})" keyboard_data1="tags ${ib_board} ${ib_post_id}" - reply_markup="$(printf "%s" "${reply_markup}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]')" + reply_markup="$( + printf "%s" "${reply_markup}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/submodules/callback_tags.zsh b/submodules/callback_tags.zsh index 45c073f..2d75420 100644 --- a/submodules/callback_tags.zsh +++ b/submodules/callback_tags.zsh @@ -78,27 +78,34 @@ then return 0 fi -link_preview_options="$(jq --null-input --compact-output \ - --arg url "${ib_sample_url}" \ - '{"url": $url, "prefer_small_media": true, "show_above_text": true}')" +link_preview_options="$( + jq --null-input --compact-output \ + --arg url "${ib_sample_url}" \ + '{"url": $url, "prefer_small_media": true, "show_above_text": true}' +)" keyboard_text1="Back" keyboard_data1="post ${ib_board} ${ib_post_id}" -reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '{"inline_keyboard": [[{"text": $text1, "callback_data": $data1}]]}')" +reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '{"inline_keyboard": [[{"text": $text1, "callback_data": $data1}]]}' +)" if [[ ${ib_tags_offset} -gt 0 ]] then keyboard_text1="Over" keyboard_data1="tags ${ib_board} ${ib_post_id}" - reply_markup="$(printf "%s" "${reply_markup}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]')" + reply_markup="$( + printf "%s" "${reply_markup}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi if [[ $(($#ib_tags - ib_tags_offset - ib_tags_count)) -gt 0 ]] @@ -106,8 +113,11 @@ then keyboard_text1="Next" keyboard_data1="tags ${ib_board} ${ib_post_id} $((ib_tags_offset + ib_tags_count))" - reply_markup="$(printf "%s" "${reply_markup}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]')" + reply_markup="$( + printf "%s" "${reply_markup}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/submodules/command_help.zsh b/submodules/command_help.zsh index 29ee848..883c553 100644 --- a/submodules/command_help.zsh +++ b/submodules/command_help.zsh @@ -4,5 +4,7 @@ . "${units}/help.zsh" -link_preview_options="$(jq --null-input --compact-output \ - '{"is_disabled": true}')" +link_preview_options="$( + jq --null-input --compact-output \ + '{"is_disabled": true}' +)" diff --git a/submodules/command_original.zsh b/submodules/command_original.zsh index 652199a..8225c27 100644 --- a/submodules/command_original.zsh +++ b/submodules/command_original.zsh @@ -23,10 +23,12 @@ then keyboard_text1="Original file link" keyboard_url1="${ib_file_url}" - reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - '{"inline_keyboard": [[{"text": $text1, "url": $url1}]]}')" + reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + '{"inline_keyboard": [[{"text": $text1, "url": $url1}]]}' + )" fi if [[ -n "${output_text}" ]] diff --git a/submodules/command_post.zsh b/submodules/command_post.zsh index b0852e0..0844d46 100644 --- a/submodules/command_post.zsh +++ b/submodules/command_post.zsh @@ -18,25 +18,32 @@ fi . "${units}/ib_post.zsh" -link_preview_options="$(jq --null-input --compact-output \ - --arg url "${ib_sample_url}" \ - '{"url": $url, "prefer_small_media": true, "show_above_text": true}')" +link_preview_options="$( + jq --null-input --compact-output \ + --arg url "${ib_sample_url}" \ + '{"url": $url, "prefer_small_media": true, "show_above_text": true}' +)" keyboard_text1="Post link" keyboard_url1="${ib_url}$(printf "%s" "${ib_post_id}" | urlencode)" -reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - '{"inline_keyboard": [[{"text": $text1, "url": $url1}]]}')" +reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + '{"inline_keyboard": [[{"text": $text1, "url": $url1}]]}' +)" if [[ ${#ib_tags} -gt 0 ]] then keyboard_text1="Tags (${#ib_tags})" keyboard_data1="tags ${ib_board} ${ib_post_id}" - reply_markup="$(printf "%s" "${reply_markup}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]')" + reply_markup="$( + printf "%s" "${reply_markup}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/submodules/command_short.zsh b/submodules/command_short.zsh index 06db275..29f0ef8 100644 --- a/submodules/command_short.zsh +++ b/submodules/command_short.zsh @@ -22,10 +22,12 @@ output_text="<b>Shortcut:</b> <code>$(printf "%s" "${short_query}" | htmlescape) keyboard_text1="Open inline" keyboard_query1="${short_query}" -reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - '{"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]}')" +reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + '{"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]}' +)" short_query="short ${short_query}" @@ -34,8 +36,11 @@ then keyboard_text1="Manage" keyboard_data1="${short_query}" - reply_markup="$(printf "%s" "${reply_markup}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]')" + reply_markup="$( + printf "%s" "${reply_markup}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/submodules/command_shorts.zsh b/submodules/command_shorts.zsh index 8ac588f..58bae24 100644 --- a/submodules/command_shorts.zsh +++ b/submodules/command_shorts.zsh @@ -23,12 +23,14 @@ then keyboard_text2="Remove all" keyboard_data2="reset" - reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - --arg text2 "${keyboard_text2}" \ - --arg data2 "${keyboard_data2}" \ - '{"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}, {"text": $text2, "callback_data": $data2}]]}')" + reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + --arg text2 "${keyboard_text2}" \ + --arg data2 "${keyboard_data2}" \ + '{"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}, {"text": $text2, "callback_data": $data2}]]}' + )" else output_text="You have no saved shortcuts yet" fi diff --git a/submodules/command_source.zsh b/submodules/command_source.zsh index 9117453..ed45709 100644 --- a/submodules/command_source.zsh +++ b/submodules/command_source.zsh @@ -55,9 +55,11 @@ then fi thumbnail="$(jq -r ".results.[${highest_index}].header.thumbnail" "${sn_file}")" -link_preview_options="$(jq --null-input --compact-output \ - --arg url "${thumbnail}" \ - '{"url": $url, "prefer_small_media": true, "show_above_text": true}')" +link_preview_options="$( + jq --null-input --compact-output \ + --arg url "${thumbnail}" \ + '{"url": $url, "prefer_small_media": true, "show_above_text": true}' +)" danbooru_id="$(jq -r ".results.[${highest_index}].data.danbooru_id" "${sn_file}")" gelbooru_id="$(jq -r ".results.[${highest_index}].data.gelbooru_id" "${sn_file}")" diff --git a/submodules/command_stop.zsh b/submodules/command_stop.zsh index a957691..25af38e 100644 --- a/submodules/command_stop.zsh +++ b/submodules/command_stop.zsh @@ -7,7 +7,9 @@ output_text="Remove all your data including login data and saved shortcuts" keyboard_text1="Remove my data" keyboard_data1="stop" -reply_markup="$(jq --null-input --compact-output \ +reply_markup="$( + jq --null-input --compact-output \ --arg text1 "${keyboard_text1}" \ --arg data1 "${keyboard_data1}" \ - '{"inline_keyboard": [[{"text": $text1, "callback_data": $data1}]]}')" + '{"inline_keyboard": [[{"text": $text1, "callback_data": $data1}]]}' +)" diff --git a/submodules/inline_donate.zsh b/submodules/inline_donate.zsh index cf538cd..7bbe9a8 100644 --- a/submodules/inline_donate.zsh +++ b/submodules/inline_donate.zsh @@ -12,9 +12,11 @@ output_title="Donate" output_text="$(< "${files}/donate.txt")" output_description="Click to send the details" -results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_description}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "description": $description}]')" +results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_description}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "description": $description}]' +)" diff --git a/submodules/inline_help.zsh b/submodules/inline_help.zsh index 1ef1911..5191cc5 100644 --- a/submodules/inline_help.zsh +++ b/submodules/inline_help.zsh @@ -7,9 +7,11 @@ output_title="Sekoohaka Bot" output_description="Click to send the help message" -results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_description}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML", "link_preview_options": {"is_disabled": true}}, "description": $description}]')" +results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_description}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML", "link_preview_options": {"is_disabled": true}}, "description": $description}]' +)" diff --git a/submodules/inline_original.zsh b/submodules/inline_original.zsh index 5000ea8..0b05730 100644 --- a/submodules/inline_original.zsh +++ b/submodules/inline_original.zsh @@ -7,12 +7,14 @@ ib_lock=0 if [[ -n "${output_text}" ]] then - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_text}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_text}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]' + )" return 0 fi @@ -23,23 +25,27 @@ if [[ -n "${output_text}" ]] then output_title="An error occurred" - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_text}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_text}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]' + )" else output_title="Original file of post ${ib_post_id}" output_description="Click to send the original file" - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg document_url "${ib_file_url}" \ - --arg description "${output_description}" \ - --arg thumbnail_url "${ib_preview_url}" \ - '[{"type": "document", "id": $id, "title": $title, "document_url": $document_url, "mime_type": "application/zip", "description": $description, "thumbnail_url", $thumbnail_url}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg document_url "${ib_file_url}" \ + --arg description "${output_description}" \ + --arg thumbnail_url "${ib_preview_url}" \ + '[{"type": "document", "id": $id, "title": $title, "document_url": $document_url, "mime_type": "application/zip", "description": $description, "thumbnail_url", $thumbnail_url}]' + )" fi if [[ -n "${ib_file_url}" && "${ib_file_url}" != "null" ]] @@ -47,8 +53,11 @@ then keyboard_text1="Original file link" keyboard_url1="${ib_file_url}" - results="$(printf "%s" "${results}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - '.[0] += {"reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}]]}}')" + results="$( + printf "%s" "${results}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + '.[0] += {"reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}]]}}' + )" fi diff --git a/submodules/inline_post.zsh b/submodules/inline_post.zsh index 8bf3f9a..6bd910e 100644 --- a/submodules/inline_post.zsh +++ b/submodules/inline_post.zsh @@ -7,12 +7,14 @@ ib_lock=0 if [[ -n "${output_text}" ]] then - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_text}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_text}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]' + )" return 0 fi @@ -25,24 +27,29 @@ output_description="Click to send the post information" keyboard_text1="Post link" keyboard_url1="${ib_url}$(printf "%s" "${ib_post_id}" | urlencode)" -results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg url "${ib_sample_url}" \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg description "${output_description}" \ - --arg thumbnail_url "${ib_preview_url}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML", "link_preview_options": {"url": $url, "prefer_small_media": true, "show_above_text": true}}, "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}]]}, "description": $description, "thumbnail_url": $thumbnail_url}]')" +results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg url "${ib_sample_url}" \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg description "${output_description}" \ + --arg thumbnail_url "${ib_preview_url}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML", "link_preview_options": {"url": $url, "prefer_small_media": true, "show_above_text": true}}, "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}]]}, "description": $description, "thumbnail_url": $thumbnail_url}]' +)" if [[ ${#ib_tags} -gt 0 ]] then keyboard_text1="Tags (${#ib_tags})" keyboard_data1="tags ${ib_board} ${ib_post_id}" - results="$(printf "%s" "${results}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.[0].reply_markup.inline_keyboard[0] += [{"text": $text1, "callback_data": $data1}]')" + results="$( + printf "%s" "${results}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.[0].reply_markup.inline_keyboard[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/submodules/inline_search.zsh b/submodules/inline_search.zsh index 2667a3c..f9eb0a6 100644 --- a/submodules/inline_search.zsh +++ b/submodules/inline_search.zsh @@ -26,12 +26,14 @@ ib_lock=0 if [[ -n "${output_text}" ]] then - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_text}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_text}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]' + )" return 0 fi diff --git a/submodules/inline_search_pools.zsh b/submodules/inline_search_pools.zsh index 2caee2d..6e67c0b 100644 --- a/submodules/inline_search_pools.zsh +++ b/submodules/inline_search_pools.zsh @@ -36,16 +36,18 @@ then keyboard_query2="${keyboard_query2} ${search_query}" fi -result="$(jq --null-input --compact-output \ - --arg id "${ib_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_description}" \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg text2 "${keyboard_text2}" \ - --arg query2 "${keyboard_query2}" \ - '{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "description": $description, "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}')" +result="$( + jq --null-input --compact-output \ + --arg id "${ib_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_description}" \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg text2 "${keyboard_text2}" \ + --arg query2 "${keyboard_query2}" \ + '{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "description": $description, "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}' +)" if [[ -n "${ib_quick}" ]] then @@ -57,8 +59,11 @@ then keyboard_query1="${keyboard_query1} ${ib_iorder}" fi - result="$(printf "%s" "${result}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - '.reply_markup.inline_keyboard += [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]')" + result="$( + printf "%s" "${result}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + '.reply_markup.inline_keyboard += [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]' + )" fi diff --git a/submodules/inline_search_posts.zsh b/submodules/inline_search_posts.zsh index 4a8ea9c..a983e00 100644 --- a/submodules/inline_search_posts.zsh +++ b/submodules/inline_search_posts.zsh @@ -72,46 +72,52 @@ fi case "${ib_type}" in (photo) - result="$(jq --null-input --compact-output \ - --arg id "${ib_id}" \ - --arg photo_url "${ib_sample_url}" \ - --arg thumbnail_url "${ib_preview_url}" \ - --arg photo_width "${ib_width}" \ - --arg photo_height "${ib_height}" \ - --arg caption "${output_text}" \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg text2 "${keyboard_text2}" \ - --arg query2 "${keyboard_query2}" \ - '{"type": "photo", "id": $id, "photo_url": $photo_url, "thumbnail_url": $thumbnail_url, "photo_width": $photo_width, "photo_height": $photo_height, "caption": $caption, "parse_mode": "HTML", "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}')" + result="$( + jq --null-input --compact-output \ + --arg id "${ib_id}" \ + --arg photo_url "${ib_sample_url}" \ + --arg thumbnail_url "${ib_preview_url}" \ + --arg photo_width "${ib_width}" \ + --arg photo_height "${ib_height}" \ + --arg caption "${output_text}" \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg text2 "${keyboard_text2}" \ + --arg query2 "${keyboard_query2}" \ + '{"type": "photo", "id": $id, "photo_url": $photo_url, "thumbnail_url": $thumbnail_url, "photo_width": $photo_width, "photo_height": $photo_height, "caption": $caption, "parse_mode": "HTML", "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}' + )" ;; (gif) - result="$(jq --null-input --compact-output \ - --arg id "${ib_id}" \ - --arg gif_url "${ib_file_url}" \ - --arg thumbnail_url "${ib_preview_url}" \ - --arg gif_width "${ib_width}" \ - --arg gif_height "${ib_height}" \ - --arg caption "${output_text}" \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg text2 "${keyboard_text2}" \ - --arg query2 "${keyboard_query2}" \ - '{"type": "gif", "id": $id, "gif_url": $gif_url, "thumbnail_url": $thumbnail_url, "gif_width": $gif_width, "gif_height": $gif_height, "caption": $caption, "parse_mode": "HTML", "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}')" + result="$( + jq --null-input --compact-output \ + --arg id "${ib_id}" \ + --arg gif_url "${ib_file_url}" \ + --arg thumbnail_url "${ib_preview_url}" \ + --arg gif_width "${ib_width}" \ + --arg gif_height "${ib_height}" \ + --arg caption "${output_text}" \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg text2 "${keyboard_text2}" \ + --arg query2 "${keyboard_query2}" \ + '{"type": "gif", "id": $id, "gif_url": $gif_url, "thumbnail_url": $thumbnail_url, "gif_width": $gif_width, "gif_height": $gif_height, "caption": $caption, "parse_mode": "HTML", "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}' + )" ;; (video) - result="$(jq --null-input --compact-output \ - --arg id "${ib_id}" \ - --arg mpeg4_url "${ib_file_url}" \ - --arg thumbnail_url "${ib_preview_url}" \ - --arg mpeg4_width "${ib_width}" \ - --arg mpeg4_height "${ib_height}" \ - --arg caption "${output_text}" \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg text2 "${keyboard_text2}" \ - --arg query2 "${keyboard_query2}" \ - '{"type": "mpeg4_gif", "id": $id, "mpeg4_url": $mpeg4_url, "thumbnail_url": $thumbnail_url, "mpeg4_width": $mpeg4_width, "mpeg4_height": $mpeg4_height, "caption": $caption, "parse_mode": "HTML", "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}')" + result="$( + jq --null-input --compact-output \ + --arg id "${ib_id}" \ + --arg mpeg4_url "${ib_file_url}" \ + --arg thumbnail_url "${ib_preview_url}" \ + --arg mpeg4_width "${ib_width}" \ + --arg mpeg4_height "${ib_height}" \ + --arg caption "${output_text}" \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg text2 "${keyboard_text2}" \ + --arg query2 "${keyboard_query2}" \ + '{"type": "mpeg4_gif", "id": $id, "mpeg4_url": $mpeg4_url, "thumbnail_url": $thumbnail_url, "mpeg4_width": $mpeg4_width, "mpeg4_height": $mpeg4_height, "caption": $caption, "parse_mode": "HTML", "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}' + )" ;; esac @@ -122,12 +128,15 @@ then keyboard_text2="Post" keyboard_query2="post ${ib_board} ${ib_id}" - result="$(printf "%s" "${result}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - --arg text2 "${keyboard_text2}" \ - --arg query2 "${keyboard_query2}" \ - '.reply_markup.inline_keyboard += [[{"text": $text1, "switch_inline_query_current_chat": $query1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]')" + result="$( + printf "%s" "${result}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + --arg text2 "${keyboard_text2}" \ + --arg query2 "${keyboard_query2}" \ + '.reply_markup.inline_keyboard += [[{"text": $text1, "switch_inline_query_current_chat": $query1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]' + )" fi if [[ "${cache_mode}" = "advanced" ]] diff --git a/submodules/inline_search_tags.zsh b/submodules/inline_search_tags.zsh index 771f85b..fdc1876 100644 --- a/submodules/inline_search_tags.zsh +++ b/submodules/inline_search_tags.zsh @@ -26,24 +26,29 @@ then keyboard_query2="${keyboard_query2} ${search_query}" fi -result="$(jq --null-input --compact-output \ - --arg id "${ib_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_description}" \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg text2 "${keyboard_text2}" \ - --arg query2 "${keyboard_query2}" \ - '{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "description": $description, "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}')" +result="$( + jq --null-input --compact-output \ + --arg id "${ib_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_description}" \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg text2 "${keyboard_text2}" \ + --arg query2 "${keyboard_query2}" \ + '{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "description": $description, "reply_markup": {"inline_keyboard": [[{"text": $text1, "url": $url1}, {"text": $text2, "switch_inline_query_current_chat": $query2}]]}}' +)" if [[ -n "${ib_quick}" ]] then keyboard_text1="Search posts" keyboard_query1="p ${ib_board} ${ib_tag}" - result="$(printf "%s" "${result}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - '.reply_markup.inline_keyboard += [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]')" + result="$( + printf "%s" "${result}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + '.reply_markup.inline_keyboard += [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]' + )" fi diff --git a/submodules/inline_short.zsh b/submodules/inline_short.zsh index 88a77c0..7d4cecb 100644 --- a/submodules/inline_short.zsh +++ b/submodules/inline_short.zsh @@ -10,12 +10,14 @@ else output_title="Invalid arguments" output_text="You must specify the query" - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_text}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_text}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]' + )" return 0 fi @@ -27,14 +29,16 @@ output_description="${short_query}" keyboard_text1="Open inline" keyboard_query1="${short_query}" -results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - --arg description "${output_description}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "reply_markup": {"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]}, "description": $description}]')" +results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + --arg description "${output_description}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "reply_markup": {"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]}, "description": $description}]' +)" short_query="short ${short_query}" @@ -43,8 +47,11 @@ then keyboard_text1="Manage" keyboard_data1="${short_query}" - results="$(printf "%s" "${results}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.[0].reply_markup.inline_keyboard[0] += [{"text": $text1, "callback_data": $data1}]')" + results="$( + printf "%s" "${results}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.[0].reply_markup.inline_keyboard[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/submodules/inline_shorts.zsh b/submodules/inline_shorts.zsh index e0be2da..e61aab3 100644 --- a/submodules/inline_shorts.zsh +++ b/submodules/inline_shorts.zsh @@ -12,12 +12,14 @@ shorts_config="${user_config}/shorts" if [[ -n "${output_text}" ]] then - results="$(jq --null-input --compact-output \ - --arg id "${query_id}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg description "${output_text}" \ - '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]')" + results="$( + jq --null-input --compact-output \ + --arg id "${query_id}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg description "${output_text}" \ + '[{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text}, "description": $description}]' + )" rmdir "${user_config}_short.lock" return 0 @@ -36,14 +38,16 @@ do keyboard_text1="Open inline" keyboard_query1="${short_query}" - result="$(jq --null-input --compact-output \ - --arg id "${shorts[idx]}" \ - --arg title "${output_title}" \ - --arg text "${output_text}" \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - --arg description "${output_description}" \ - '{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "reply_markup": {"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]}, "description": $description}')" + result="$( + jq --null-input --compact-output \ + --arg id "${shorts[idx]}" \ + --arg title "${output_title}" \ + --arg text "${output_text}" \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + --arg description "${output_description}" \ + '{"type": "article", "id": $id, "title": $title, "input_message_content": {"message_text": $text, "parse_mode": "HTML"}, "reply_markup": {"inline_keyboard": [[{"text": $text1, "switch_inline_query_current_chat": $query1}]]}, "description": $description}' + )" if [[ "${chat_type}" = "sender" ]] then @@ -55,10 +59,13 @@ do keyboard_query1="${keyboard_query1} ${search_query}" fi - result="$(printf "%s" "${result}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg query1 "${keyboard_query1}" \ - '.reply_markup.inline_keyboard.[0] += [{"text": $text1, "switch_inline_query_current_chat": $query1}]')" + result="$( + printf "%s" "${result}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg query1 "${keyboard_query1}" \ + '.reply_markup.inline_keyboard.[0] += [{"text": $text1, "switch_inline_query_current_chat": $query1}]' + )" fi if [[ -n "${shorts_quick}" ]] @@ -66,10 +73,13 @@ do keyboard_text1="Manage" keyboard_data1="short ${short_query}" - result="$(printf "%s" "${result}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.reply_markup.inline_keyboard += [[{"text": $text1, "callback_data": $data1}]]')" + result="$( + printf "%s" "${result}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.reply_markup.inline_keyboard += [[{"text": $text1, "callback_data": $data1}]]' + )" fi results+=(${result}) diff --git a/submodules/url_parser.zsh b/submodules/url_parser.zsh index 992db64..db82bca 100644 --- a/submodules/url_parser.zsh +++ b/submodules/url_parser.zsh @@ -67,39 +67,48 @@ then keyboard_text1="Delete" keyboard_data1="delete" - reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '{"inline_keyboard": [[{"text": $text1, "callback_data": $data1}]]}')" + reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '{"inline_keyboard": [[{"text": $text1, "callback_data": $data1}]]}' + )" return 0 fi . "${units}/ib_post.zsh" -link_preview_options="$(jq --null-input --compact-output \ - --arg url "${ib_sample_url}" \ - '{"url": $url, "prefer_small_media": true, "show_above_text": true}')" +link_preview_options="$( + jq --null-input --compact-output \ + --arg url "${ib_sample_url}" \ + '{"url": $url, "prefer_small_media": true, "show_above_text": true}' +)" keyboard_text1="Post link" keyboard_url1="${ib_url}$(printf "%s" "${ib_post_id}" | urlencode)" keyboard_text2="Delete" keyboard_data2="delete" -reply_markup="$(jq --null-input --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg url1 "${keyboard_url1}" \ - --arg text2 "${keyboard_text2}" \ - --arg data2 "${keyboard_data2}" \ - '{"inline_keyboard": [[{"text": $text1, "url": $url1}], [{"text": $text2, "callback_data": $data2}]]}')" +reply_markup="$( + jq --null-input --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg url1 "${keyboard_url1}" \ + --arg text2 "${keyboard_text2}" \ + --arg data2 "${keyboard_data2}" \ + '{"inline_keyboard": [[{"text": $text1, "url": $url1}], [{"text": $text2, "callback_data": $data2}]]}' +)" if [[ ${#ib_tags} -gt 0 ]] then keyboard_text1="Tags (${#ib_tags})" keyboard_data1="tags ${ib_board} ${ib_post_id}" - reply_markup="$(printf "%s" "${reply_markup}" | jq --compact-output \ - --arg text1 "${keyboard_text1}" \ - --arg data1 "${keyboard_data1}" \ - '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]')" + reply_markup="$( + printf "%s" "${reply_markup}" | + jq --compact-output \ + --arg text1 "${keyboard_text1}" \ + --arg data1 "${keyboard_data1}" \ + '.inline_keyboard.[0] += [{"text": $text1, "callback_data": $data1}]' + )" fi diff --git a/units/ib_size.zsh b/units/ib_size.zsh index 762c801..69f8abe 100644 --- a/units/ib_size.zsh +++ b/units/ib_size.zsh @@ -12,16 +12,18 @@ then return 0 fi -ib_file_size="$(curl --connect-timeout ${connrefused_timeout} \ - --head \ - --max-time ${head_timeout} \ - --proxy "${external_proxy}" \ - --retry 1 \ - --retry-connrefused \ - --retry-max-time $((external_timeout - connrefused_timeout)) \ - --silent \ - --user-agent "${useragent}" \ - "${ib_file_url}" | +ib_file_size="$( + curl --connect-timeout ${connrefused_timeout} \ + --head \ + --max-time ${head_timeout} \ + --proxy "${external_proxy}" \ + --retry 1 \ + --retry-connrefused \ + --retry-max-time $((external_timeout - connrefused_timeout)) \ + --silent \ + --user-agent "${useragent}" \ + "${ib_file_url}" | grep -i "content-length" | parameter 2 | - tr -d '\r')" + tr -d '\r' +)" |
