mirror of
https://codeberg.org/grunfink/snac2.git
synced 2024-11-10 03:50:38 +03:00
Added a user config override for 'purge_days'.
This commit is contained in:
parent
0f4db7cf26
commit
d817264e52
9
data.c
9
data.c
@ -184,20 +184,20 @@ int user_open(snac *snac, const char *uid)
|
|||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
||||||
if ((snac->config_o = xs_json_loads(j)) == NULL)
|
if ((snac->config_o = xs_json_loads(j)) == NULL)
|
||||||
srv_log(xs_fmt("cannot parse '%s'", cfg_file_o));
|
srv_log(xs_fmt("error parsing '%s'", cfg_file_o));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (snac->config_o == NULL)
|
if (snac->config_o == NULL)
|
||||||
snac->config_o = xs_dict_new();
|
snac->config_o = xs_dict_new();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
srv_log(xs_fmt("cannot parse '%s'", key_file));
|
srv_log(xs_fmt("error parsing '%s'", key_file));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
srv_log(xs_fmt("error opening '%s' %d", key_file, errno));
|
srv_log(xs_fmt("error opening '%s' %d", key_file, errno));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
srv_log(xs_fmt("cannot parse '%s'", cfg_file));
|
srv_log(xs_fmt("error parsing '%s'", cfg_file));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
srv_debug(2, xs_fmt("error opening '%s' %d", cfg_file, errno));
|
srv_debug(2, xs_fmt("error opening '%s' %d", cfg_file, errno));
|
||||||
@ -1648,7 +1648,8 @@ void purge_user(snac *snac)
|
|||||||
priv_days = xs_number_get(xs_dict_get(srv_config, "timeline_purge_days"));
|
priv_days = xs_number_get(xs_dict_get(srv_config, "timeline_purge_days"));
|
||||||
pub_days = xs_number_get(xs_dict_get(srv_config, "local_purge_days"));
|
pub_days = xs_number_get(xs_dict_get(srv_config, "local_purge_days"));
|
||||||
|
|
||||||
if ((v = xs_dict_get(snac->config, "purge_days")) != NULL)
|
if ((v = xs_dict_get(snac->config_o, "purge_days")) != NULL ||
|
||||||
|
(v = xs_dict_get(snac->config, "purge_days")) != NULL)
|
||||||
user_days = xs_number_get(v);
|
user_days = xs_number_get(v);
|
||||||
|
|
||||||
if (user_days) {
|
if (user_days) {
|
||||||
|
Loading…
Reference in New Issue
Block a user