summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2022-11-13 08:41:50 +0100
committerGravatar default2022-11-13 08:41:50 +0100
commit73323a7fc0bf29b0409a34bafc728374fd58bb7a (patch)
tree6db6b653e29d6e8e1fcf1b959926818e6b54a9d3
parentUpdated TODO. (diff)
downloadsnac2-73323a7fc0bf29b0409a34bafc728374fd58bb7a.tar.gz
snac2-73323a7fc0bf29b0409a34bafc728374fd58bb7a.tar.xz
snac2-73323a7fc0bf29b0409a34bafc728374fd58bb7a.zip
Some formatting refactoring.
Diffstat
-rw-r--r--activitypub.c4
-rw-r--r--format.c6
-rw-r--r--html.c2
-rw-r--r--main.c2
-rw-r--r--snac.h2
5 files changed, 7 insertions, 9 deletions
diff --git a/activitypub.c b/activitypub.c
index ccb21c8..6314314 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -409,7 +409,7 @@ d_char *msg_actor(snac *snac)
409 msg = xs_dict_set(msg, "preferredUsername", snac->uid); 409 msg = xs_dict_set(msg, "preferredUsername", snac->uid);
410 msg = xs_dict_set(msg, "published", xs_dict_get(snac->config, "published")); 410 msg = xs_dict_set(msg, "published", xs_dict_get(snac->config, "published"));
411 411
412 not_really_markdown(xs_dict_get(snac->config, "bio"), &f_bio); 412 f_bio = not_really_markdown(xs_dict_get(snac->config, "bio"));
413 msg = xs_dict_set(msg, "summary", f_bio); 413 msg = xs_dict_set(msg, "summary", f_bio);
414 414
415 char *folders[] = { "inbox", "outbox", "followers", "following", NULL }; 415 char *folders[] = { "inbox", "outbox", "followers", "following", NULL };
@@ -548,7 +548,7 @@ d_char *msg_note(snac *snac, char *content, char *rcpts, char *in_reply_to, char
548 } 548 }
549 549
550 /* format the content */ 550 /* format the content */
551 not_really_markdown(content, &fc2); 551 fc2 = not_really_markdown(content);
552 552
553 /* extract the tags */ 553 /* extract the tags */
554 process_tags(fc2, &fc1, &tag); 554 process_tags(fc2, &fc1, &tag);
diff --git a/format.c b/format.c
index 93080fe..13f0840 100644
--- a/format.c
+++ b/format.c
@@ -34,7 +34,7 @@ struct {
34}; 34};
35 35
36 36
37d_char *not_really_markdown(char *content, d_char **f_content) 37d_char *not_really_markdown(char *content)
38/* formats a content using some Markdown rules */ 38/* formats a content using some Markdown rules */
39{ 39{
40 d_char *s = NULL; 40 d_char *s = NULL;
@@ -149,9 +149,7 @@ d_char *not_really_markdown(char *content, d_char **f_content)
149 s = xs_replace_i(s, smileys[n].key, smileys[n].value); 149 s = xs_replace_i(s, smileys[n].key, smileys[n].value);
150 } 150 }
151 151
152 *f_content = s; 152 return s;
153
154 return *f_content;
155} 153}
156 154
157 155
diff --git a/html.c b/html.c
index f7c2b2f..2d4f3a4 100644
--- a/html.c
+++ b/html.c
@@ -215,7 +215,7 @@ d_char *html_user_header(snac *snac, d_char *s, int local)
215 "<div class=\"p-note snac-top-user-bio\">%s</div>\n" 215 "<div class=\"p-note snac-top-user-bio\">%s</div>\n"
216 "</div>\n"; 216 "</div>\n";
217 217
218 not_really_markdown(xs_dict_get(snac->config, "bio"), &bio); 218 bio = not_really_markdown(xs_dict_get(snac->config, "bio"));
219 219
220 xs *s1 = xs_fmt(_tmpl, 220 xs *s1 = xs_fmt(_tmpl,
221 xs_dict_get(snac->config, "name"), 221 xs_dict_get(snac->config, "name"),
diff --git a/main.c b/main.c
index 4c4df43..befbd32 100644
--- a/main.c
+++ b/main.c
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
79 if (strcmp(cmd, "markdown") == 0) { 79 if (strcmp(cmd, "markdown") == 0) {
80 /* undocumented, for testing only */ 80 /* undocumented, for testing only */
81 xs *c = xs_readall(stdin); 81 xs *c = xs_readall(stdin);
82 xs *fc = not_really_markdown(c, &fc); 82 xs *fc = not_really_markdown(c);
83 83
84 printf("<html>\n%s\n</html>\n", fc); 84 printf("<html>\n%s\n</html>\n", fc);
85 return 0; 85 return 0;
diff --git a/snac.h b/snac.h
index 16ef81c..bff5da4 100644
--- a/snac.h
+++ b/snac.h
@@ -135,7 +135,7 @@ int activitypub_post_handler(d_char *req, char *q_path,
135 char *payload, int p_size, 135 char *payload, int p_size,
136 char **body, int *b_size, char **ctype); 136 char **body, int *b_size, char **ctype);
137 137
138d_char *not_really_markdown(char *content, d_char **f_content); 138d_char *not_really_markdown(char *content);
139d_char *sanitize(d_char *str); 139d_char *sanitize(d_char *str);
140 140
141int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char **ctype); 141int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char **ctype);
HIC SVNT DRACONES