Merge pull request 'Major rollback & Put "User Settings" outside of "Operations...."' (#76) from yonle/snac2:master into master

Reviewed-on: https://codeberg.org/grunfink/snac2/pulls/76

4 files changed, 39 insertions, 37 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9d387f3..f7e281c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,9 +1,5 @@
 # Release Notes
 
-## 2.39
-
-User settings have been moved to their own page.
-
 ## 2.38
 
 More vulnerability fixes (contributed by yonle).
diff --git a/html.c b/html.c
index 725c064..7ce94f2 100644
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-        /* snac - A simple, minimalistic ActivityPub instance */
+/* snac - A simple, minimalistic ActivityPub instance */
 /* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
@@ -325,8 +325,8 @@ d_char *html_user_header(snac *snac, d_char *s, int local)
             s1 = xs_fmt(
                 "<a href=\"%s.rss\">%s</a> - "
                 "<a href=\"%s/admin\" rel=\"nofollow\">%s</a></nav>\n",
-                snac->uid, L("RSS"),
-                snac->uid, L("private"));
+                snac->actor, L("RSS"),
+                snac->actor, L("private"));
         else {
             xs *n_list = notify_list(snac, 1);
             int n_len  = xs_list_len(n_list);
@@ -340,14 +340,14 @@ d_char *html_user_header(snac *snac, d_char *s, int local)
                 n_str = xs_str_new("");
 
             s1 = xs_fmt(
-                "<a href=\"../%s\">%s</a> - "
-                "<a href=\"admin\">%s</a> - "
-                "<a href=\"notifications\">%s</a>%s - "
-                "<a href=\"people\">%s</a></nav>\n",
-                snac->uid, L("public"),
-                L("private"),
-                L("notifications"), n_str,
-                L("people"));
+                "<a href=\"%s\">%s</a> - "
+                "<a href=\"%s/admin\">%s</a> - "
+                "<a href=\"%s/notifications\">%s</a>%s - "
+                "<a href=\"%s/people\">%s</a></nav>\n",
+                snac->actor, L("public"),
+                snac->actor, L("private"),
+                snac->actor, L("notifications"), n_str,
+                snac->actor, L("people"));
         }
 
         s = xs_str_cat(s, s1);
@@ -394,7 +394,7 @@ d_char *html_top_controls(snac *snac, d_char *s)
         "<div class=\"snac-note\">\n"
         "<details><summary>%s</summary>\n"
         "<form autocomplete=\"off\" method=\"post\" "
-        "action=\"admin/note\" enctype=\"multipart/form-data\">\n"
+        "action=\"%s/admin/note\" enctype=\"multipart/form-data\">\n"
         "<textarea class=\"snac-textarea\" name=\"content\" "
         "rows=\"8\" wrap=\"virtual\" required=\"required\" placeholder=\"What's on your mind?\"></textarea>\n"
         "<input type=\"hidden\" name=\"in_reply_to\" value=\"\">\n"
@@ -431,12 +431,12 @@ d_char *html_top_controls(snac *snac, d_char *s)
         "<div class=\"snac-top-controls-more\">\n"
         "<details><summary>%s</summary>\n"
 
-        "<form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n" /** follow **/
+        "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n" /** follow **/
         "<input type=\"text\" name=\"actor\" required=\"required\" placeholder=\"bob@example.com\">\n"
         "<input type=\"submit\" name=\"action\" value=\"%s\"> %s\n"
         "</form><p>\n"
 
-        "<form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n" /** boost **/
+        "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n" /** boost **/
         "<input type=\"text\" name=\"id\" required=\"required\" placeholder=\"https://fedi.example.com/bob/....\">\n"
         "<input type=\"submit\" name=\"action\" value=\"%s\"> %s\n"
         "</form><p>\n"
@@ -446,7 +446,7 @@ d_char *html_top_controls(snac *snac, d_char *s)
 
         "<div class=\"snac-user-setup\">\n" /** user setup **/
         "<form autocomplete=\"off\" method=\"post\" "
-        "action=\"admin/user-setup\" enctype=\"multipart/form-data\">\n"
+        "action=\"%s/admin/user-setup\" enctype=\"multipart/form-data\">\n"
         "<p>%s:<br>\n"
         "<input type=\"text\" name=\"name\" value=\"%s\" placeholder=\"Your name.\"></p>\n"
 
@@ -531,6 +531,7 @@ d_char *html_top_controls(snac *snac, d_char *s)
 
     xs *s1 = xs_fmt(_tmpl,
         L("New Post..."),
+        snac->actor,
         L("Sensitive content"),
         L("Sensitive content description"),
         L("Only for mentioned people"),
@@ -550,10 +551,15 @@ d_char *html_top_controls(snac *snac, d_char *s)
         L("Post"),
 
         L("Operations..."),
+
+        snac->actor,
         L("Follow"), L("(by URL or user@host)"),
+
+        snac->actor,
         L("Boost"), L("(by URL)"),
 
         L("User Settings..."),
+        snac->actor,
         L("Display name"),
         es1,
         L("Avatar"),
@@ -657,13 +663,13 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
 
     {
         xs *s1 = xs_fmt(
-            "<form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n"
+            "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n"
             "<input type=\"hidden\" name=\"id\" value=\"%s\">\n"
             "<input type=\"hidden\" name=\"actor\" value=\"%s\">\n"
             "<input type=\"hidden\" name=\"redir\" value=\"%s_entry\">\n"
             "\n",
 
-            id, actor, md5
+            snac->actor, id, actor, md5
         );
 
         s = xs_str_cat(s, s1);
@@ -717,7 +723,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
         xs *s1 = xs_fmt(
             "<p><details><summary>%s</summary>\n"
             "<p><div class=\"snac-note\" id=\"%s_edit\">\n"
-            "<form autocomplete=\"off\" method=\"post\" action=\"admin/note\" "
+            "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/note\" "
             "enctype=\"multipart/form-data\" id=\"%s_edit_form\">\n"
             "<textarea class=\"snac-textarea\" name=\"content\" "
             "rows=\"4\" wrap=\"virtual\" required=\"required\">%s</textarea>\n"
@@ -740,7 +746,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
 
             L("Edit..."),
             md5,
-            md5,
+            snac->actor, md5,
             prev_src,
             id,
             L("Sensitive content"),
@@ -768,7 +774,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
         xs *s1 = xs_fmt(
             "<p><details><summary>%s</summary>\n"
             "<p><div class=\"snac-note\" id=\"%s_reply\">\n"
-            "<form autocomplete=\"off\" method=\"post\" action=\"admin/note\" "
+            "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/note\" "
             "enctype=\"multipart/form-data\" id=\"%s_reply_form\">\n"
             "<textarea class=\"snac-textarea\" name=\"content\" "
             "rows=\"4\" wrap=\"virtual\" required=\"required\">%s</textarea>\n"
@@ -791,7 +797,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
 
             L("Reply..."),
             md5,
-            md5,
+            snac->actor, md5,
             ct,
             id,
             L("Sensitive content"),
@@ -1086,10 +1092,10 @@ xs_str *html_entry(snac *snac, xs_str *os, const xs_dict *msg, int local,
                 /* poll still active */
                 xs *s1 = xs_fmt("<div class=\"snac-poll-form\">\n"
                                 "<form autocomplete=\"off\" "
-                                "method=\"post\" action=\"admin/vote\">\n"
+                                "method=\"post\" action=\"%s/admin/vote\">\n"
                                 "<input type=\"hidden\" name=\"actor\" value= \"%s\">\n"
                                 "<input type=\"hidden\" name=\"irt\" value=\"%s\">\n",
-                    actor, id);
+                    snac->actor, actor, id);
 
                 while (xs_list_iter(&p, &v)) {
                     const char *name = xs_dict_get(v, "name");
@@ -1479,11 +1485,11 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade
             s = xs_str_cat(s, "<div class=\"snac-controls\">\n");
 
             xs *s1 = xs_fmt(
-                "<p><form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n"
+                "<p><form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n"
                 "<input type=\"hidden\" name=\"actor\" value=\"%s\">\n"
                 "<input type=\"hidden\" name=\"actor-form\" value=\"yes\">\n",
 
-                actor_id
+                snac->actor, actor_id
             );
             s = xs_str_cat(s, s1);
 
@@ -1507,7 +1513,7 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade
             xs *s2 = xs_fmt(
                 "<p><details><summary>%s</summary>\n"
                 "<p><div class=\"snac-note\" id=\"%s_%s_dm\">\n"
-                "<form autocomplete=\"off\" method=\"post\" action=\"admin/note\" "
+                "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/note\" "
                 "enctype=\"multipart/form-data\" id=\"%s_reply_form\">\n"
                 "<textarea class=\"snac-textarea\" name=\"content\" "
                 "rows=\"4\" wrap=\"virtual\" required=\"required\"></textarea>\n"
@@ -1519,7 +1525,7 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade
 
                 L("Direct Message..."),
                 md5, t,
-                md5,
+                snac->actor, md5,
                 actor_id,
                 L("Post")
             );
@@ -1570,9 +1576,9 @@ xs_str *html_notifications(snac *snac)
 
     xs *s1 = xs_fmt(
         "<form autocomplete=\"off\" "
-        "method=\"post\" action=\"admin/clear-notifications\" id=\"clear\">\n"
+        "method=\"post\" action=\"%s/admin/clear-notifications\" id=\"clear\">\n"
         "<input type=\"submit\" class=\"snac-btn-like\" value=\"%s\">\n"
-        "</form><p>\n", L("Clear all"));
+        "</form><p>\n", snac->actor, L("Clear all"));
     s = xs_str_cat(s, s1);
 
     while (xs_list_iter(&p, &v)) {
@@ -2372,9 +2378,9 @@ int html_post_handler(const xs_dict *req, const char *q_path,
         char *redir = xs_dict_get(p_vars, "redir");
 
         if (xs_is_null(redir))
-          redir = "";
+            redir = "snac-posts";
 
-        *body   = xs_fmt("../admin#%s", redir);
+        *body   = xs_fmt("%s/admin#%s", snac.actor, redir);
         *b_size = strlen(*body);
     }
 
diff --git a/httpd.c b/httpd.c
index 1d2200e..9aac3b5 100644
--- a/httpd.c
+++ b/httpd.c
@@ -91,7 +91,7 @@ int server_get_handler(xs_dict *req, char *q_path,
                     if (user_open(&snac, uid)) {
                         xs *u = xs_fmt(
                             "<li><a href=\"%s\">@%s@%s (%s)</a></li>\n",
-                                uid, uid, host,
+                                snac.actor, uid, host,
                                 xs_dict_get(snac.config, "name"));
 
                         ul = xs_str_cat(ul, u);
diff --git a/snac.h b/snac.h
index 2fd0fce..df13ddd 100644
--- a/snac.h
+++ b/snac.h
@@ -1,7 +1,7 @@
 /* snac - A simple, minimalistic ActivityPub instance */
 /* copyright (c) 2022 - 2023 grunfink / MIT license */
 
-#define VERSION "2.39-dev"
+#define VERSION "2.38"
 
 #define USER_AGENT "snac/" VERSION