Added the default 'protocol' field to 'server.json'.

RELEASE_NOTES.md

@@ -6,6 +6,8 @@ Posts that were liked or boosted can now be unliked and unboosted.
 
 Added a header to avoid over-zealous caching in some browsers (contributed by louis77).
 
+Added support for running and federating inside hidden networks like Tor, I2P or Loki (contributed by iwojima).
+
 ## 2.51
 
 Support for custom Emojis has been added; they are no longer hardcoded, but read from the `emojis.json` file at the server base directory. Also, they are no longer limited to string substitutions, but images as external URLs are also supported (see `snac(8)` for more information).

doc/snac.8

@@ -209,6 +209,13 @@ with a large number of users.
 If this numeric value (in seconds) is set, any activity coming from an account
 that was created more recently than that will be rejected. This may be used
 to mitigate spam from automatically created accounts.
+.It Ic protocol
+This string value contains the protocol (schema) to be used in URLs. If not
+set, it defaults to "https". If you run
+.Nm
+as part of a hidden network like Tor or I2P that doesn't have a TLS /
+Certificate infrastructure, you need to set it to "http". Don't change it
+unless you know what you are doing.
 .El
 .Pp
 You must restart the server to make effective these changes.

format.c

@@ -241,7 +241,7 @@ xs_str *not_really_markdown(const char *content, xs_list **attach, xs_list **tag
 
             /* is it an URL to an image? */
             if (xs_startswith(v, "https:/" "/") && xs_startswith((t = xs_mime_by_ext(v)), "image/")) {
-                if (tag) {
+                if (tag && xs_str_in(s, k) != -1) {
                     /* add the emoji to the tag list */
                     xs *e = xs_dict_new();
                     xs *i = xs_dict_new();

utils.c

@@ -34,6 +34,7 @@ static const char *default_srv_config = "{"
     "\"admin_account\":        \"\","
     "\"title\":                \"\","
     "\"short_description\":    \"\","
+    "\"protocol\":             \"https\","
     "\"fastcgi\":              false"
     "}";