From 6661ebc7a47fb6c4ecb636843ea4526c050c4978 Mon Sep 17 00:00:00 2001 From: Sonoko Mizuki Date: Thu, 20 Apr 2023 11:31:35 +0900 Subject: [PATCH 1/3] Upade lnurlw_request --- lnurlw/lnurlw_request.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lnurlw/lnurlw_request.go b/lnurlw/lnurlw_request.go index fe1a93d..f995339 100644 --- a/lnurlw/lnurlw_request.go +++ b/lnurlw/lnurlw_request.go @@ -312,11 +312,16 @@ func Response(w http.ResponseWriter, req *http.Request) { return } + defalut_description := db.Get_setting("DEFAULT_DESCRIPTION") + if defalut_description == "" { + defalut_description = "WWT withdrawal" + } + response := ResponseData{} response.Tag = "withdrawRequest" response.Callback = lnurlw_cb_url response.LnurlwK1 = lnurlw_k1 - response.DefaultDescription = "WWT withdrawal" + response.DefaultDescription = defalut_description response.MinWithdrawable = min_withdraw_sats * 1000 // milliSats response.MaxWithdrawable = max_withdraw_sats * 1000 // milliSats From 78a3dde2ed99b55105ddeca8d4c0e06b6bca2186 Mon Sep 17 00:00:00 2001 From: Sonoko Mizuki Date: Thu, 20 Apr 2023 11:31:50 +0900 Subject: [PATCH 2/3] Update settings.sql and docs --- docs/SETTINGS.md | 1 + sql/settings.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/SETTINGS.md b/docs/SETTINGS.md index e42df0b..9d3959e 100644 --- a/docs/SETTINGS.md +++ b/docs/SETTINGS.md @@ -23,6 +23,7 @@ Here are the descriptions of values available to use in the `settings` table: | FUNCTION_LNURLW | ENABLE | system level switch for LNURLw (bolt card) services | | FUNCTION_LNURLP | DISABLE | system level switch for LNURLp (lightning address) services | | FUNCTION_EMAIL | DISABLE | system level switch for email updates on credits & debits | +| DEFAULT_DESCRIPTION | '' | default description of payment | | AWS_SES_ID | | Amazon Web Services - Simple Email Service - access id | | AWS_SES_SECRET | | Amazon Web Services - Simple Email Service - access secret | | AWS_SES_EMAIL_FROM | | Amazon Web Services - Simple Email Service - email from field | diff --git a/sql/settings.sql b/sql/settings.sql index 75b7dd1..a274333 100644 --- a/sql/settings.sql +++ b/sql/settings.sql @@ -20,6 +20,7 @@ INSERT INTO settings (name, value) VALUES ('LN_TESTNODE', ''); INSERT INTO settings (name, value) VALUES ('FUNCTION_LNURLW', ''); INSERT INTO settings (name, value) VALUES ('FUNCTION_LNURLP', ''); INSERT INTO settings (name, value) VALUES ('FUNCTION_EMAIL', ''); +INSERT INTO settings (name, value) VALUES ('DEFAULT_DESCRIPTION', ''); INSERT INTO settings (name, value) VALUES ('AWS_SES_ID', ''); INSERT INTO settings (name, value) VALUES ('AWS_SES_SECRET', ''); INSERT INTO settings (name, value) VALUES ('AWS_SES_EMAIL_FROM', ''); From e9ef6973d40ceb93e523206e4a96a942b9b42932 Mon Sep 17 00:00:00 2001 From: Sonoko Mizuki Date: Sat, 22 Apr 2023 16:21:10 +0900 Subject: [PATCH 3/3] set default value of default description --- docs/SETTINGS.md | 2 +- lnurlw/lnurlw_request.go | 3 --- sql/settings.sql | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/SETTINGS.md b/docs/SETTINGS.md index 9d3959e..2337347 100644 --- a/docs/SETTINGS.md +++ b/docs/SETTINGS.md @@ -23,7 +23,7 @@ Here are the descriptions of values available to use in the `settings` table: | FUNCTION_LNURLW | ENABLE | system level switch for LNURLw (bolt card) services | | FUNCTION_LNURLP | DISABLE | system level switch for LNURLp (lightning address) services | | FUNCTION_EMAIL | DISABLE | system level switch for email updates on credits & debits | -| DEFAULT_DESCRIPTION | '' | default description of payment | +| DEFAULT_DESCRIPTION | 'bolt card service' | default description of payment | | AWS_SES_ID | | Amazon Web Services - Simple Email Service - access id | | AWS_SES_SECRET | | Amazon Web Services - Simple Email Service - access secret | | AWS_SES_EMAIL_FROM | | Amazon Web Services - Simple Email Service - email from field | diff --git a/lnurlw/lnurlw_request.go b/lnurlw/lnurlw_request.go index f995339..50bc025 100644 --- a/lnurlw/lnurlw_request.go +++ b/lnurlw/lnurlw_request.go @@ -313,9 +313,6 @@ func Response(w http.ResponseWriter, req *http.Request) { } defalut_description := db.Get_setting("DEFAULT_DESCRIPTION") - if defalut_description == "" { - defalut_description = "WWT withdrawal" - } response := ResponseData{} response.Tag = "withdrawRequest" diff --git a/sql/settings.sql b/sql/settings.sql index a274333..31dfe70 100644 --- a/sql/settings.sql +++ b/sql/settings.sql @@ -20,7 +20,7 @@ INSERT INTO settings (name, value) VALUES ('LN_TESTNODE', ''); INSERT INTO settings (name, value) VALUES ('FUNCTION_LNURLW', ''); INSERT INTO settings (name, value) VALUES ('FUNCTION_LNURLP', ''); INSERT INTO settings (name, value) VALUES ('FUNCTION_EMAIL', ''); -INSERT INTO settings (name, value) VALUES ('DEFAULT_DESCRIPTION', ''); +INSERT INTO settings (name, value) VALUES ('DEFAULT_DESCRIPTION', 'bolt card service'); INSERT INTO settings (name, value) VALUES ('AWS_SES_ID', ''); INSERT INTO settings (name, value) VALUES ('AWS_SES_SECRET', ''); INSERT INTO settings (name, value) VALUES ('AWS_SES_EMAIL_FROM', '');