10 کامیت‌ها 15197455f2 ... 08246f7005

نویسنده SHA1 پیام تاریخ
  neil 08246f7005 Merge pull request #6567 from vmichelin/dev 15 ساعت پیش
  neil c377ec69d3 Merge pull request #6571 from DuolaD/master 16 ساعت پیش
  DuolaD a2c2b7ffee Fixed the issue where Telegram bots would not push notifications. 23 ساعت پیش
  Vmichelin 25c564bae1 fix #6555 : ovh dns api enable to remove record 4 روز پیش
  neil a5754e9ec4 Merge pull request #6551 from acmesh-official/dev 1 هفته پیش
  neil a91ab54449 Merge pull request #6540 from acmesh-official/dev 3 هفته پیش
  neil b8e91036dd Merge pull request #6524 from acmesh-official/dev 3 هفته پیش
  neil 49ed112ef5 Merge pull request #6523 from acmesh-official/dev 3 هفته پیش
  neil 20c80f553f Merge pull request #6513 from acmesh-official/dev 1 ماه پیش
  neil 03dd318265 Merge pull request #6505 from acmesh-official/dev 1 ماه پیش
2فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 1 1
      dnsapi/dns_ovh.sh
  2. 2 2
      notify/telegram.sh

+ 1 - 1
dnsapi/dns_ovh.sh

@@ -201,7 +201,7 @@ dns_ovh_rm() {
     if ! _ovh_rest GET "domain/zone/$_domain/record/$rid"; then
       return 1
     fi
-    if _contains "$response" "\"target\":\"$txtvalue\""; then
+    if _contains "$response" "$txtvalue"; then
       _debug "Found txt id:$rid"
       if ! _ovh_rest DELETE "domain/zone/$_domain/record/$rid"; then
         return 1

+ 2 - 2
notify/telegram.sh

@@ -34,8 +34,8 @@ telegram_send() {
   fi
   _saveaccountconf_mutable TELEGRAM_BOT_URLBASE "$TELEGRAM_BOT_URLBASE"
 
-  _subject="$(printf "%s" "$_subject" | sed 's/\\/\\\\\\\\/g' | sed 's/\]/\\\\\]/g' | sed 's/\([-_*[()~`>#+\-=|{}.!]\)/\\\\\1/g')"
-  _content="$(printf "%s" "$_content" | sed 's/\\/\\\\\\\\/g' | sed 's/\]/\\\\\]/g' | sed 's/\([-_*[()~`>#+\-=|{}.!]\)/\\\\\1/g')"
+  _subject="$(printf "%s" "$_subject" | sed -E 's/([][()~`>#+=|{}.!*_\\-])/\\\\\1/g')"
+  _content="$(printf "%s" "$_content" | sed -E 's/([][()~`>#+=|{}.!*_\\-])/\\\\\1/g')"
   _content="$(printf "*%s*\n%s" "$_subject" "$_content" | _json_encode)"
   _data="{\"text\": \"$_content\", "
   _data="$_data\"chat_id\": \"$TELEGRAM_BOT_CHATID\", "