Home Explore Help
Sign In
mirrors
/
snac2
mirror of https://codeberg.org/grunfink/snac2.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Some formatting refactoring.

default 2 years ago
parent
88ea9b0839
commit
73323a7fc0
5 changed files with 7 additions and 9 deletions
Split View Show Diff Stats
  1. 2 2
      activitypub.c
  2. 2 4
      format.c
  3. 1 1
      html.c
  4. 1 1
      main.c
  5. 1 1
      snac.h

+ 2 - 2
activitypub.c
View File 

@@ -409,7 +409,7 @@ d_char *msg_actor(snac *snac)
 
     msg = xs_dict_set(msg, "preferredUsername", snac->uid);
 
     msg = xs_dict_set(msg, "published",         xs_dict_get(snac->config, "published"));
 
 
-    not_really_markdown(xs_dict_get(snac->config, "bio"), &f_bio);
 
+    f_bio = not_really_markdown(xs_dict_get(snac->config, "bio"));
 
     msg = xs_dict_set(msg, "summary", f_bio);
 
 
     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
 
     }
 
 
     /* format the content */
 
-    not_really_markdown(content, &fc2);
 
+    fc2 = not_really_markdown(content);
 
 
     /* extract the tags */
 
     process_tags(fc2, &fc1, &tag);

+ 2 - 4
format.c
View File 

@@ -34,7 +34,7 @@ struct {
 
 };
 
 
 
-d_char *not_really_markdown(char *content, d_char **f_content)
 
+d_char *not_really_markdown(char *content)
 
 /* formats a content using some Markdown rules */
 
 {
 
     d_char *s = NULL;
 
@@ -149,9 +149,7 @@ d_char *not_really_markdown(char *content, d_char **f_content)
 
             s = xs_replace_i(s, smileys[n].key, smileys[n].value);
 
     }
 
 
-    *f_content = s;
 
-
 
-    return *f_content;
 
+    return s;
 
 }

+ 1 - 1
html.c
View File 

@@ -215,7 +215,7 @@ d_char *html_user_header(snac *snac, d_char *s, int local)
 
             "<div class=\"p-note snac-top-user-bio\">%s</div>\n"
 
             "</div>\n";
 
 
-        not_really_markdown(xs_dict_get(snac->config, "bio"), &bio);
 
+        bio = not_really_markdown(xs_dict_get(snac->config, "bio"));
 
 
         xs *s1 = xs_fmt(_tmpl,
 
             xs_dict_get(snac->config, "name"),

+ 1 - 1
main.c
View File 

@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 
     if (strcmp(cmd, "markdown") == 0) {
 
         /* undocumented, for testing only */
 
         xs *c = xs_readall(stdin);
 
-        xs *fc = not_really_markdown(c, &fc);
 
+        xs *fc = not_really_markdown(c);
 
 
         printf("<html>\n%s\n</html>\n", fc);
 
         return 0;

+ 1 - 1
snac.h
View File 

@@ -135,7 +135,7 @@ int activitypub_post_handler(d_char *req, char *q_path,
 
                              char *payload, int p_size,
 
                              char **body, int *b_size, char **ctype);
 
 
-d_char *not_really_markdown(char *content, d_char **f_content);
 
+d_char *not_really_markdown(char *content);
 
 d_char *sanitize(d_char *str);
 
 
 int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char **ctype);