diff --git a/README_ru.md b/README_ru.md index 168ee28..f9d62cb 100644 --- a/README_ru.md +++ b/README_ru.md @@ -56,9 +56,12 @@ First line
Second line # Сетевые функции -* `net:get_text(url)` - функция для получения текстовых данных по по протоколу HTTP (JSON, XML, plain text). +* `http:get(url, [id])` - выполняет запрос HTTP GET, id - строка-идентификатор запрос (см. ниже); +* `http:post(url, string, [id])` - выполняет запрос HTTP POST, второй аргумент - JSON-строка; +* `http:put(url, [id])` - выполняет запрос HTTP PUT; +* `http:delete(url, [id])` - выполняет запрос HTTP DELETE. -Функция не возвращает никакого значения, а вместо этого вызывает колбек `on_network_result(string, number)`. Первый аргмент: тело ответа, второй - код (200, 404 и т.д.). +Эти функции не возвращают никакого значения, а вместо этого вызывают колбек `on_network_result(string, [code], [id])`. Первый аргумент: тело ответа, второй (опциональный) - код (200, 404 и т.д.), третий (опциональный) - строка, идентифицирующая запрос, если она была указана в запросе. # Функции обработки данных diff --git a/btc-widget.lua b/btc-widget.lua index 5084ef1..6cfcc98 100644 --- a/btc-widget.lua +++ b/btc-widget.lua @@ -7,7 +7,7 @@ equals = " = " function on_alarm() - net:get_text("https://api.blockchain.info/ticker") + http:get("https://api.blockchain.info/ticker") end function on_network_result(result) diff --git a/covid-widget.lua b/covid-widget.lua index 7b81746..58f6984 100644 --- a/covid-widget.lua +++ b/covid-widget.lua @@ -7,7 +7,7 @@ equals = " = " function on_alarm() - net:get_text("https://api.covid19api.com/summary") + http:get("https://api.covid19api.com/summary") end function on_network_result(result) diff --git a/currencies-ru-widget.lua b/currencies-ru-widget.lua index 06138f4..de199c5 100644 --- a/currencies-ru-widget.lua +++ b/currencies-ru-widget.lua @@ -20,7 +20,7 @@ function on_alarm() end function get_rates(loc_date) - net:get_text("https://cdn.jsdelivr.net/gh/fawazahmed0/currency-api@1/"..loc_date.."/currencies/usd.json") + http:get("https://cdn.jsdelivr.net/gh/fawazahmed0/currency-api@1/"..loc_date.."/currencies/usd.json") end function on_network_result(result) diff --git a/github_trending-widget.lua b/github_trending-widget.lua index fcc722d..5be2d5f 100644 --- a/github_trending-widget.lua +++ b/github_trending-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("https://api.trending-github.com/github/repositories") + http:get("https://api.trending-github.com/github/repositories") end function on_network_result(result) diff --git a/icndb-widget.lua b/icndb-widget.lua index 419eed1..daa3f16 100644 --- a/icndb-widget.lua +++ b/icndb-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("http://api.icndb.com/jokes/random") + http:get("http://api.icndb.com/jokes/random") end function on_network_result(result) diff --git a/inspiration_quotes-widget.lua b/inspiration_quotes-widget.lua index b9378f1..7994f51 100644 --- a/inspiration_quotes-widget.lua +++ b/inspiration_quotes-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("https://inspiration.goprogram.ai/") + http:get("https://inspiration.goprogram.ai/") end function on_network_result(result) diff --git a/isdayoff-ru-widget.lua b/isdayoff-ru-widget.lua index 1cf8eb8..bb5e5c6 100644 --- a/isdayoff-ru-widget.lua +++ b/isdayoff-ru-widget.lua @@ -6,7 +6,7 @@ function on_alarm() local dateStr = os.date('%Y%m%d') - net:get_text("https://isdayoff.ru/"..dateStr) + http:get("https://isdayoff.ru/"..dateStr) end function on_network_result(result) diff --git a/place-widget.lua b/place-widget.lua index 9732a11..aecc0a4 100644 --- a/place-widget.lua +++ b/place-widget.lua @@ -1,6 +1,6 @@ function on_alarm() local location = system:get_location() - net:get_text("https://nominatim.openstreetmap.org/reverse?format=json&lat=".. location[1].."&lon=".. location[2].."&addressdetails=1") + http:get("https://nominatim.openstreetmap.org/reverse?format=json&lat=".. location[1].."&lon=".. location[2].."&addressdetails=1") end function on_network_result(result) diff --git a/public_ip-widget.lua b/public_ip-widget.lua index 365f917..1cc30fb 100644 --- a/public_ip-widget.lua +++ b/public_ip-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("https://api.ipify.org") + http:get("https://api.ipify.org") end function on_network_result(result) diff --git a/quotes-ru-widget.lua b/quotes-ru-widget.lua index 17ae9ea..403a79d 100644 --- a/quotes-ru-widget.lua +++ b/quotes-ru-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("http://api.forismatic.com/api/1.0/?method=getQuote&format=json&lang=ru") + http:get("http://api.forismatic.com/api/1.0/?method=getQuote&format=json&lang=ru") end function on_network_result(result) diff --git a/quotes-widget.lua b/quotes-widget.lua index e5b3dc5..6f291b2 100644 --- a/quotes-widget.lua +++ b/quotes-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("https://api.quotable.io/random") + http:get("https://api.quotable.io/random") end function on_network_result(result) diff --git a/random-joke-widget.lua b/random-joke-widget.lua index c3d0d1f..aee1264 100644 --- a/random-joke-widget.lua +++ b/random-joke-widget.lua @@ -5,7 +5,7 @@ -- version = "1.0" function on_alarm() - net:get_text("https://official-joke-api.appspot.com/random_joke") + http:get("https://official-joke-api.appspot.com/random_joke") end function on_network_result(result) diff --git a/test-return-code.lua b/test-return-code.lua index f16ff13..fec8ed4 100644 --- a/test-return-code.lua +++ b/test-return-code.lua @@ -1,5 +1,5 @@ function on_resume() - net:get_text("https://google.com") + http:get("https://google.com") end function on_network_result(body, code)