commit 31e037a7d6c9d7cbd3eb2f5644c5b5ac0be9b61f
parent d520ce3a6044a6316df3ab12b6c775500631f2ff
Author: Florian Dold <florian@dold.me>
Date: Thu, 25 Sep 2025 12:31:01 +0200
return charity pub in charity listing
Diffstat:
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/donau/donau-httpd_charities_get.c b/src/donau/donau-httpd_charities_get.c
@@ -44,6 +44,7 @@ static enum GNUNET_GenericReturnValue
charities_cb (
void *cls,
uint64_t charity_id,
+ const struct DONAU_CharityPublicKeyP *charity_pub,
const char *charity_name,
struct TALER_Amount max_per_year,
struct TALER_Amount receipts_to_date)
@@ -57,6 +58,8 @@ charities_cb (
GNUNET_JSON_PACK (
GNUNET_JSON_pack_uint64 ("charity_id",
charity_id),
+ GNUNET_JSON_pack_data_auto ("charity_pub",
+ charity_pub),
GNUNET_JSON_pack_string ("name",
charity_name),
TALER_JSON_pack_amount ("max_per_year",
diff --git a/src/donaudb/pg_get_charities.c b/src/donaudb/pg_get_charities.c
@@ -72,11 +72,14 @@ get_charities_cb (void *cls,
for (unsigned int i = 0; i < num_results; i++)
{
uint64_t charity_id;
+ struct DONAU_CharityPublicKeyP charity_pub;
char *charity_name;
struct TALER_Amount max_per_year;
struct TALER_Amount receipts_to_date;
uint64_t current_year;
struct GNUNET_PQ_ResultSpec rs[] = {
+ GNUNET_PQ_result_spec_auto_from_type ("charity_pub",
+ &charity_pub),
GNUNET_PQ_result_spec_uint64 ("charity_id",
&charity_id),
GNUNET_PQ_result_spec_string ("charity_name",
@@ -108,6 +111,7 @@ get_charities_cb (void *cls,
if (GNUNET_OK !=
ctx->cb (ctx->cb_cls,
charity_id,
+ &charity_pub,
charity_name,
max_per_year,
receipts_to_date))
@@ -136,6 +140,7 @@ DH_PG_get_charities (void *cls,
"get_charities",
"SELECT"
" charity_id"
+ ",charity_pub"
",charity_name"
",max_per_year"
",receipts_to_date"
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
@@ -172,6 +172,7 @@ typedef enum GNUNET_GenericReturnValue
(*DONAUDB_GetCharitiesCallback)(
void *cls,
uint64_t charity_id,
+ const struct DONAU_CharityPublicKeyP *charity_pub,
const char *charity_name,
struct TALER_Amount max_per_year,
struct TALER_Amount receipts_to_date);