7 files changed, 69 insertions, 16 deletions

diff --git a/activitypub.c b/activitypub.c
index 1efd9ec..4ed2805 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -17,25 +17,25 @@
 
 #include <sys/wait.h>
 
-const char *public_address = "https:/" "/www.w3.org/ns/activitystreams#Public";
+const char * const public_address = "https:/" "/www.w3.org/ns/activitystreams#Public";
 
 /* susie.png */
 
-const char *susie =
+const char * const susie =
     "iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQAAAAC"
     "CEkxzAAAAUUlEQVQoz43R0QkAMQwCUDdw/y3dwE"
     "vsvzlL4X1IoQkAisKmwfAFT3RgJHbQezpSRoXEq"
     "eqCL9BJBf7h3QbOCCxV5EVWMEMwG7K1/WODtlvx"
     "AYTtEsDU9F34AAAAAElFTkSuQmCC";
 
-const char *susie_cool =
+const char * const susie_cool =
     "iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQAAAAC"
     "CEkxzAAAAV0lEQVQoz43RwQ3AMAwCQDZg/y3ZgN"
     "qo3+JaedwDOUQBQFHYaTB8wTM6sGl2cMPu+DFzn"
     "+ZcgN7wF7ZVihXkfSlWIVzIA6dbQzaygllpNuTX"
     "ZmmFNlvxADX1+o0cUPMbAAAAAElFTkSuQmCC";
 
-const char *susie_muertos =
+const char * const susie_muertos =
     "iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQAAAAC"
     "CEkxzAAAAV0lEQVQoz4XQsQ0AMQxCUW/A/lv+DT"
     "ic6zGRolekIMyMELNp8PiCEw6Q4w4NoAt53IH5m"
@@ -3101,6 +3101,11 @@ void process_user_queue_item(snac *user, xs_dict *q_item)
         const char *actor = xs_dict_get(q_item, "actor");
         double mtime = object_mtime(actor);
 
+        if (actor_failure(actor, 0) == -1) {
+            /* actor is broken beyond repair */
+            snac_debug(user, 1, xs_fmt("actor_refresh skipped broken actor %s", actor));
+        }
+        else
         /* only refresh if it was refreshed more than an hour ago */
         if (mtime + 3600.0 < (double) time(NULL)) {
             xs *actor_o = NULL;
@@ -3108,8 +3113,16 @@ void process_user_queue_item(snac *user, xs_dict *q_item)
 
             if (valid_status((status = activitypub_request(user, actor, &actor_o))))
                 actor_add(actor, actor_o);
-            else
-                object_touch(actor);
+            else {
+                if (status == HTTP_STATUS_GONE) {
+                    actor_failure(actor, 1);
+                    snac_log(user, xs_fmt("actor_refresh marking actor %s as broken %d", actor, status));
+                }
+                else {
+                    actor_failure(actor, 2);
+                    object_touch(actor);
+                }
+            }
 
             snac_log(user, xs_fmt("actor_refresh %s %d", actor, status));
         }
diff --git a/data.c b/data.c
index 9ef0d42..53e9438 100644
--- a/data.c
+++ b/data.c
@@ -3046,6 +3046,45 @@ xs_list *content_search(snac *user, const char *regex,
 }
 
 
+int actor_failure(const char *actor, int op)
+/* actor failure maintenance */
+{
+    int ret = 0;
+
+    xs *md5 = xs_md5_hex(actor, strlen(actor));
+    xs *fn = xs_fmt("%s/failure/%s", srv_basedir, md5);
+
+    switch (op) {
+    case 0: /** check **/
+        if (mtime(fn))
+            ret = -1;
+
+        break;
+
+    case 1: /** register a failure **/
+        if (mtime(fn) == 0.0) {
+            FILE *f;
+
+            /* only create once, as the date will be used */
+            if ((f = fopen(fn, "w")) != NULL) {
+                fprintf(f, "%s\n", actor);
+                fclose(f);
+            }
+        }
+
+        break;
+
+    case 2: /** clear a failure **/
+        /* called whenever a message comes from this instance */
+        unlink(fn);
+
+        break;
+    }
+
+    return ret;
+}
+
+
 int instance_failure(const char *url, int op)
 /* do some checks and accounting on instance failures */
 {
diff --git a/format.c b/format.c
index e3f20c2..84c634d 100644
--- a/format.c
+++ b/format.c
@@ -13,7 +13,7 @@
 #include "snac.h"
 
 /* emoticons, people laughing and such */
-const char *smileys[] = {
+const char * const smileys[] = {
     ":-)",        "&#128578;",
     ":-D",        "&#128512;",
     "X-D",        "&#128518;",
@@ -49,7 +49,7 @@ xs_dict *emojis(void)
     if (mtime(fn) == 0) {
         /* file does not exist; create it with the defaults */
         xs *d = xs_dict_new();
-        const char **emo = smileys;
+        const char * const *emo = smileys;
 
         while (*emo) {
             d = xs_dict_append(d, emo[0], emo[1]);
@@ -443,7 +443,7 @@ xs_str *not_really_markdown(const char *content, xs_list **attach, xs_list **tag
 }
 
 
-const char *valid_tags[] = {
+const char * const valid_tags[] = {
     "a", "p", "br", "br/", "blockquote", "ul", "ol", "li", "cite", "small",
     "span", "i", "b", "u", "s", "pre", "code", "em", "strong", "hr", "img", "del", "bdi",
     "h2","h3", //anzu
diff --git a/httpd.c b/httpd.c
index 50f56f2..de76776 100644
--- a/httpd.c
+++ b/httpd.c
@@ -59,7 +59,7 @@ static jmp_buf on_break;
 /** code **/
 
 /* nodeinfo 2.0 template */
-const char *nodeinfo_2_0_template = ""
+const char * const nodeinfo_2_0_template = ""
     "{\"version\":\"2.0\","
     "\"software\":{\"name\":\"snac\",\"version\":\"" VERSION "\"},"
     "\"protocols\":[\"activitypub\"],"
@@ -172,7 +172,7 @@ static xs_str *greeting_html(void)
 }
 
 
-const char *share_page = ""
+const char * const share_page = ""
 "<!DOCTYPE html>\n"
 "<html>\n"
 "<head>\n"
@@ -190,7 +190,7 @@ const char *share_page = ""
 "";
 
 
-const char *authorize_interaction_page = ""
+const char * const authorize_interaction_page = ""
 "<!DOCTYPE html>\n"
 "<html>\n"
 "<head>\n"
diff --git a/mastoapi.c b/mastoapi.c
index ed46b89..26af7d2 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -161,7 +161,7 @@ int token_del(const char *id)
 }
 
 
-const char *login_page = ""
+const char * const login_page = ""
 "<!DOCTYPE html>\n"
 "<html>\n"
 "<head>\n"
diff --git a/snac.h b/snac.h
index dc9d19a..5ed054a 100644
--- a/snac.h
+++ b/snac.h
@@ -285,6 +285,7 @@ int content_match(const char *file, const xs_dict *msg);
 xs_list *content_search(snac *user, const char *regex,
             int priv, int skip, int show, int max_secs, int *timeout);
 
+int actor_failure(const char *actor, int op);
 int instance_failure(const char *url, int op);
 
 void enqueue_input(snac *snac, const xs_dict *msg, const xs_dict *req, int retries);
diff --git a/utils.c b/utils.c
index bdee09d..38dcc06 100644
--- a/utils.c
+++ b/utils.c
@@ -16,7 +16,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-static const char *default_srv_config = "{"
+static const char * const default_srv_config = "{"
     "\"host\":                 \"\","
     "\"prefix\":               \"\","
     "\"address\":              \"127.0.0.1\","
@@ -42,7 +42,7 @@ static const char *default_srv_config = "{"
     "\"fastcgi\":              false"
     "}";
 
-static const char *default_css =
+static const char * const default_css =
     "body { max-width: 48em; margin: auto; line-height: 1.5; padding: 0.8em; word-wrap: break-word; }\n"
     "pre { overflow-x: scroll; }\n"
     "blockquote { font-style: italic; }\n"
@@ -97,7 +97,7 @@ const char *snac_blurb =
     "automatic sign-up process.</p>\n"
 ;
 
-static const char *greeting_html =
+static const char * const greeting_html =
     "<!DOCTYPE html>\n"
     "<html><head>\n"
     "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>\n"