diff options
| author | 2024-04-18 17:13:31 +0200 | |
|---|---|---|
| committer | 2024-04-18 17:13:31 +0200 | |
| commit | 26840e0dc0e7322b2041c21b4e44ed9a34afff4b (patch) | |
| tree | 096c8e9c65df453f5e45bfde8ca8662b9a82c899 /data.c | |
| parent | Merge pull request 'Ability to federate with hidden networks #93 (update for ... (diff) | |
| download | snac2-26840e0dc0e7322b2041c21b4e44ed9a34afff4b.tar.gz snac2-26840e0dc0e7322b2041c21b4e44ed9a34afff4b.tar.xz snac2-26840e0dc0e7322b2041c21b4e44ed9a34afff4b.zip | |
Some tweaks to previous patch.
Diffstat (limited to 'data.c')
| -rw-r--r-- | data.c | 6 |
1 files changed, 4 insertions, 2 deletions
| @@ -60,15 +60,17 @@ int srv_open(char *basedir, int auto_upgrade) | |||
| 60 | char *host; | 60 | char *host; |
| 61 | char *prefix; | 61 | char *prefix; |
| 62 | char *dbglvl; | 62 | char *dbglvl; |
| 63 | char *proto; | ||
| 63 | 64 | ||
| 64 | host = xs_dict_get(srv_config, "host"); | 65 | host = xs_dict_get(srv_config, "host"); |
| 65 | prefix = xs_dict_get(srv_config, "prefix"); | 66 | prefix = xs_dict_get(srv_config, "prefix"); |
| 66 | dbglvl = xs_dict_get(srv_config, "dbglevel"); | 67 | dbglvl = xs_dict_get(srv_config, "dbglevel"); |
| 68 | proto = xs_dict_get_def(srv_config, "protocol", "https"); | ||
| 67 | 69 | ||
| 68 | if (host == NULL || prefix == NULL) | 70 | if (host == NULL || prefix == NULL) |
| 69 | error = xs_str_new("ERROR: cannot get server data"); | 71 | error = xs_str_new("ERROR: cannot get server data"); |
| 70 | else { | 72 | else { |
| 71 | srv_baseurl = xs_fmt("http://%s%s", host, prefix); | 73 | srv_baseurl = xs_fmt("%s:/" "/%s%s", proto, host, prefix); |
| 72 | 74 | ||
| 73 | dbglevel = (int) xs_number_get(dbglvl); | 75 | dbglevel = (int) xs_number_get(dbglvl); |
| 74 | 76 | ||
| @@ -1990,7 +1992,7 @@ xs_list *inbox_list(void) | |||
| 1990 | 1992 | ||
| 1991 | xs_str *_instance_block_fn(const char *instance) | 1993 | xs_str *_instance_block_fn(const char *instance) |
| 1992 | { | 1994 | { |
| 1993 | xs *s = xs_replace(instance, "http:/" "/", ""); | 1995 | xs *s = xs_replace(instance, "http:/" "/", ""); |
| 1994 | xs *s1 = xs_replace(s, "https:/" "/", ""); | 1996 | xs *s1 = xs_replace(s, "https:/" "/", ""); |
| 1995 | xs *l = xs_split(s1, "/"); | 1997 | xs *l = xs_split(s1, "/"); |
| 1996 | char *p = xs_list_get(l, 0); | 1998 | char *p = xs_list_get(l, 0); |