From 09a667a6cd1c18fc5af11836a651d262c261e2b8 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 21 Jul 2022 23:32:08 +0000
Subject: [PATCH 001/143] Create new branch named "perlify"

FossilOrigin-Name: c62e59c0dc3bb1b12fbaa520f3d923833beb0737e449f0012673b725560562d8

From 10875ff940e70881065c921e24408caded04974c Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 22 Jul 2022 03:56:41 +0000
Subject: [PATCH 002/143] Load perl

FossilOrigin-Name: 0107dd3706329714f684f913c2ae67d072851eca96b981c11f5315e1ef780c22
---
 .fossil-settings/ignore-glob |  3 ++-
 Makefile                     | 14 +++++++++++---
 config.def.h                 |  2 ++
 perl/main.pl                 |  9 +++++++++
 src/global_perl.h            | 26 ++++++++++++++++++++++++++
 src/main.c                   | 22 +++++++++++++++++++++-
 6 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 perl/main.pl
 create mode 100644 src/global_perl.h

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index cab4136..0cf097b 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -9,4 +9,5 @@ mastodont-c
 config.h
 treebird
 test/tests
-scripts/*.o
\ No newline at end of file
+scripts/*.o
+perl/*.cpl
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 9a32a50..b7e958f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,26 +2,31 @@ CC ?= cc
 GIT ?= git
 MASTODONT_DIR = mastodont-c/
 MASTODONT = $(MASTODONT_DIR)libmastodont.a
-CFLAGS += -Wall -I $(MASTODONT_DIR)include/ -Wno-unused-variable -Wno-ignored-qualifiers -I/usr/include/ -I $(MASTODONT_DIR)/libs $(shell pkg-config --cflags libcurl libpcre2-8)
-LDFLAGS = -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpcre2-8) -lfcgi -lpthread
+CFLAGS += -Wall -I $(MASTODONT_DIR)include/ -Wno-unused-variable -Wno-ignored-qualifiers -I/usr/include/ -I $(MASTODONT_DIR)/libs $(shell pkg-config --cflags libcurl libpcre2-8) `perl -MExtUtils::Embed -e ccopts`
+LDFLAGS = -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpcre2-8) -lfcgi -lpthread `perl -MExtUtils::Embed -e ldopts`
 SRC = $(wildcard src/*.c)
 OBJ = $(patsubst %.c,%.o,$(SRC))
 HEADERS = $(wildcard src/*.h) config.h
 PAGES_DIR = static
+PERL_DIR = perl
 PAGES = $(wildcard $(PAGES_DIR)/*.tmpl)
+PERLS = $(wildcard $(PERL_DIR)/*.pl)
 PAGES_CMP = $(patsubst %.tmpl,%.ctmpl,$(PAGES))
 PAGES_C = $(patsubst %.tmpl, %.c,$(PAGES))
 PAGES_C_OBJ = $(patsubst %.c,%.o,$(PAGES_C))
+PERLS_C = $(patsubst %.pl,%.cpl,$(PERLS))
 DIST = dist/
 PREFIX ?= /usr/local
 TARGET = treebird
 
+$(info $(PERLS) and $(PERLS_C))
+
 MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 
 all: $(MASTODONT_DIR) dep_build $(TARGET)
 apache: all apache_start
 
-$(TARGET): filec template $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ)  $(OBJ) $(HEADERS)
+$(TARGET): filec template $(PERLS_C) $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ) $(OBJ) $(HEADERS) 
 	$(CC) -o $(TARGET) $(OBJ) $(PAGES_C_OBJ) $(LDFLAGS)
 
 template: src/template/main.o
@@ -39,6 +44,9 @@ emojitoc: scripts/emoji-to.o
 $(PAGES_DIR)/%.ctmpl: $(PAGES_DIR)/%.tmpl
 	./template $< $(notdir $*) 2> $(PAGES_DIR)/$(notdir $*).c 1> $@
 
+$(PERL_DIR)/%.cpl: $(PERL_DIR)/%.pl
+	./filec $< data_$(notdir $*)_pl > $@
+
 $(MASTODONT_DIR): 
 	cd ..; fossil clone $(MASTODONT_URL) || true
 	cd treebird; ln -s ../mastodont-c .
diff --git a/config.def.h b/config.def.h
index a5eed39..34e65c0 100644
--- a/config.def.h
+++ b/config.def.h
@@ -9,8 +9,10 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 #include <mastodont.h>
+#if !(defined(FALSE) && defined(TRUE))
 #define FALSE 0
 #define TRUE 1
+#endif
 #define UNSET NULL
 
 /*
diff --git a/perl/main.pl b/perl/main.pl
new file mode 100644
index 0000000..8c02b21
--- /dev/null
+++ b/perl/main.pl
@@ -0,0 +1,9 @@
+use strict;
+use warnings;
+
+sub square
+{
+    2 * 2;
+}
+
+print "Hello treebird" . square;
diff --git a/src/global_perl.h b/src/global_perl.h
new file mode 100644
index 0000000..cf43d4d
--- /dev/null
+++ b/src/global_perl.h
@@ -0,0 +1,26 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef GLOBAL_PERL_H
+#define GLOBAL_PERL_H
+#include <EXTERN.h>
+#include <perl.h>
+
+static PerlInterpreter* perl;
+
+#endif /* GLOBAL_PERL_H */
diff --git a/src/main.c b/src/main.c
index d936a60..7fbc59a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,8 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <EXTERN.h>
+#include <perl.h>
 #include <pthread.h>
 #include <fcgi_stdio.h>
+#include "global_perl.h"
 #include <fcgiapp.h>
 #include <string.h>
 #include <mastodont.h>
@@ -44,6 +47,7 @@
 #include "local_config_set.h"
 #include "global_cache.h"
 #include "conversations.h"
+#include "../perl/main.cpl"
 
 #define THREAD_COUNT 20
 
@@ -190,12 +194,23 @@ static void* cgi_start(void* arg)
     return NULL;
 }
 
-int main(void)
+int main(int argc, char **argv, char **env)
 {
     // Global init
     mastodont_global_curl_init();
     FCGX_Init();
 
+    // Initialize Perl
+    PERL_SYS_INIT3(&argc, &argv, &env);
+    perl = perl_alloc();
+    perl_construct(perl);
+    //char* perl_argv[] = { "", "-e", data_main_pl, NULL };
+    char* perl_argv[] = { "", "perl/main.pl", NULL };
+
+    perl_parse(perl, NULL, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
+    PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+    perl_run(perl);
+
     // Initiate mastodont library
     mastodont_t api;
     mastodont_init(&api);
@@ -215,4 +230,9 @@ int main(void)
     free_instance_info_cache();
     mastodont_cleanup(&api);
     mastodont_global_curl_cleanup();
+
+    perl_destruct(perl);
+    perl_free(perl);
+    PERL_SYS_TERM();
+    return EXIT_SUCCESS;
 }

From 004b47ad073ddbf3610839f214cbb45180bfd1e2 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 22 Jul 2022 05:02:59 +0000
Subject: [PATCH 003/143] Perlify config

FossilOrigin-Name: e39a49305b7b3a890a937a41550e7d927764bf768e2a8d1b916df553f23c31cf
---
 perl/main.pl  |  5 +++--
 src/main.c    |  1 -
 src/session.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/session.h |  2 ++
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/perl/main.pl b/perl/main.pl
index 8c02b21..a9072b3 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -1,9 +1,10 @@
 use strict;
 use warnings;
 
-sub square
+sub base_page
 {
+    
     2 * 2;
 }
 
-print "Hello treebird" . square;
+print "Hello from Perl\n";
diff --git a/src/main.c b/src/main.c
index 7fbc59a..9939e37 100644
--- a/src/main.c
+++ b/src/main.c
@@ -225,7 +225,6 @@ int main(int argc, char **argv, char **env)
 
     // Hell, let's not sit around here either
     cgi_start(&api);
-
    
     free_instance_info_cache();
     mastodont_cleanup(&api);
diff --git a/src/session.c b/src/session.c
index ac4e546..44f1f3d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -29,3 +29,54 @@ const char* const get_token(struct session* ssn)
 {
     return keystr(ssn->cookies.access_token);
 }
+
+static HV* perlify_post_values(struct post_values* post)
+{
+}
+
+static HV* perlify_get_values(struct get_values* get)
+{
+}
+
+static HV* perlify_config(struct local_config* config)
+{
+    HV* ssn_config_hv = newHV();
+
+    hv_stores(ssn_config_hv, "logged_in", newSVpv(config->logged_in, 0));
+    hv_stores(ssn_config_hv, "theme", newSVpv(config->theme, 0));
+    hv_stores(ssn_config_hv, "background_url", newSVpv(config->background_url, 0));
+    hv_stores(ssn_config_hv, "lang", newSViv(config->lang));
+    hv_stores(ssn_config_hv, "themeclr", newSViv(config->themeclr));
+    hv_stores(ssn_config_hv, "jsactions", newSViv(config->jsactions));
+    hv_stores(ssn_config_hv, "jslive", newSViv(config->jslive));
+    hv_stores(ssn_config_hv, "js", newSViv(config->js));
+    hv_stores(ssn_config_hv, "interact_img", newSViv(config->interact_img));
+    hv_stores(ssn_config_hv, "stat_attachments", newSViv(config->stat_attachments));
+    hv_stores(ssn_config_hv, "stat_greentexts", newSViv(config->stat_greentexts));
+    hv_stores(ssn_config_hv, "stat_dope", newSViv(config->stat_dope));
+    hv_stores(ssn_config_hv, "stat_oneclicksoftware", newSViv(config->stat_oneclicksoftware));
+    hv_stores(ssn_config_hv, "stat_emojo_likes", newSViv(config->stat_emojo_likes));
+    hv_stores(ssn_config_hv, "stat_hide_muted", newSViv(config->stat_hide_muted));
+    hv_stores(ssn_config_hv, "instance_show_shoutbox", newSViv(config->instance_show_shoutbox));
+    hv_stores(ssn_config_hv, "instance_panel", newSViv(config->instance_panel));
+    hv_stores(ssn_config_hv, "notif_embed", newSViv(config->notif_embed));
+    hv_stores(ssn_config_hv, "sidebar_opacity", newSViv(config->sidebar_opacity));
+    
+    return ssn_config_hv;
+}
+
+HV* perlify_session(struct session* ssn)
+{
+    HV* ssn_hv = newHV();
+    hv_stores(ssn_hv, "logged_in", newSVuv(ssn->logged_in));
+//    HV* ssn_post_values = perlify_post_values(&(ssn->post));
+//    HV* ssn_get_values = perlify_get_values(&(ssn->query));
+//    HV* ssn_get_values = perlify_cookie_values(&(ssn->query))
+    // Config
+    HV* ssn_config = perlify_config(&(ssn->config));
+    hv_stores(ssn_hv, "config", newRV_inc((SV*)ssn_config));
+    
+
+    return ssn_hv;
+}
+
diff --git a/src/session.h b/src/session.h
index 6d9a23a..5c4f968 100644
--- a/src/session.h
+++ b/src/session.h
@@ -19,6 +19,7 @@
 #ifndef SESSION_H
 #define SESSION_H
 #include <mastodont.h>
+#include "global_perl.h"
 #include "query.h"
 #include "local_config.h"
 #include "cookie.h"
@@ -36,5 +37,6 @@ struct session
 
 const char* const get_instance(struct session* ssn);
 const char* const get_token(struct session* ssn);
+HV* perlify_session(struct session* ssn);
 
 #endif // SESSION_H

From 772db3ce2899e3c9d13b3fc0205992e9080927b4 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 22 Jul 2022 22:41:07 +0000
Subject: [PATCH 004/143] perl L10N and Perl Templates

FossilOrigin-Name: 06ed73d30ae11c7651dcb87e4b78f9ef7b297b386f8ff0bbd087e22628bc9a68
---
 Makefile           |  17 +++--
 perl/l10n.pm       |  89 ++++++++++++++++++++++++++
 perl/main.pl       |  25 +++++++-
 src/base_page.c    | 155 +++++++++++++++++++++++++--------------------
 src/base_page.h    |   2 +-
 src/main.c         |  16 ++++-
 templates/main.ctt |   5 ++
 templates/main.tt  |  87 +++++++++++++++++++++++++
 8 files changed, 313 insertions(+), 83 deletions(-)
 create mode 100644 perl/l10n.pm
 create mode 100644 templates/main.ctt
 create mode 100644 templates/main.tt

diff --git a/Makefile b/Makefile
index b7e958f..3c42bb7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,25 +8,23 @@ SRC = $(wildcard src/*.c)
 OBJ = $(patsubst %.c,%.o,$(SRC))
 HEADERS = $(wildcard src/*.h) config.h
 PAGES_DIR = static
-PERL_DIR = perl
+TMPL_DIR = templates
 PAGES = $(wildcard $(PAGES_DIR)/*.tmpl)
-PERLS = $(wildcard $(PERL_DIR)/*.pl)
+TMPLS = $(wildcard $(TMPL_DIR)/*.tt)
 PAGES_CMP = $(patsubst %.tmpl,%.ctmpl,$(PAGES))
 PAGES_C = $(patsubst %.tmpl, %.c,$(PAGES))
 PAGES_C_OBJ = $(patsubst %.c,%.o,$(PAGES_C))
-PERLS_C = $(patsubst %.pl,%.cpl,$(PERLS))
+TMPLS_C = $(patsubst %.tt,%.ctt,$(TMPLS))
 DIST = dist/
 PREFIX ?= /usr/local
 TARGET = treebird
 
-$(info $(PERLS) and $(PERLS_C))
-
 MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 
 all: $(MASTODONT_DIR) dep_build $(TARGET)
 apache: all apache_start
 
-$(TARGET): filec template $(PERLS_C) $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ) $(OBJ) $(HEADERS) 
+$(TARGET): filec template $(TMPLS_C) $(TMPLS) $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ) $(OBJ) $(HEADERS) 
 	$(CC) -o $(TARGET) $(OBJ) $(PAGES_C_OBJ) $(LDFLAGS)
 
 template: src/template/main.o
@@ -41,11 +39,11 @@ emojitoc: scripts/emoji-to.o
 
 # Redirect stdout and stderr into separate contents as a hack
 # Let bash do the work :)
-$(PAGES_DIR)/%.ctmpl: $(PAGES_DIR)/%.tmpl
+$(PAGES_DIR)/%.ctmpl: $(PAGES_DIR)/%.tmpl $(TMPLS)
 	./template $< $(notdir $*) 2> $(PAGES_DIR)/$(notdir $*).c 1> $@
 
-$(PERL_DIR)/%.cpl: $(PERL_DIR)/%.pl
-	./filec $< data_$(notdir $*)_pl > $@
+$(TMPL_DIR)/%.ctt: $(TMPL_DIR)/%.tt
+	./filec $< data_$(notdir $*)_tt > $@
 
 $(MASTODONT_DIR): 
 	cd ..; fossil clone $(MASTODONT_URL) || true
@@ -71,6 +69,7 @@ dep_build:
 clean:
 	rm -f $(OBJ) src/file-to-c/main.o
 	rm -f $(PAGES_CMP)
+	rm -f $(TMPLS_C)
 	rm -f filec
 	make -C $(MASTODONT_DIR) clean
 
diff --git a/perl/l10n.pm b/perl/l10n.pm
new file mode 100644
index 0000000..67c50fc
--- /dev/null
+++ b/perl/l10n.pm
@@ -0,0 +1,89 @@
+package l10n;
+
+our @EXPORT = qw( %L10N );
+
+our %L10N = (
+    EN_US => {
+        APP_NAME => 'Treebird',
+        HOME => 'Home',
+        LOCAL => 'Local',
+        FEDERATED => 'Federated',
+        NOTIFICATIONS => 'Notifications',
+        LISTS => 'Lists',
+        FAVOURITES => 'Favorites',
+        BOOKMARKS => 'Bookmarks',
+        DIRECT => 'Direct',
+        CONFIG => 'Config',
+        SEARCH_PLACEHOLDER => 'Search',
+        SEARCH_BUTTON => 'Search',
+        GENERAL => 'General',
+        ACCOUNT => 'Account',
+        JAVASCRIPT => 'JavaScript',
+        CFG_QUICK_ACTIONS => 'Quick actions - Likes, Boosts, etc done in the background',
+        CFG_QUICK_REPLY => 'Quick reply - Replies don\'t require redirects',
+        LIVE_STATUSES => 'Live statuses - Statuses fetch on the fly',
+        APPEARANCE => 'Appearance',
+        VARIANT => 'Variant',
+        THEME_TREEBIRD20 => 'Treebird - Default, simple theme',
+        THEME_TREEBIRD30 => 'Treebird 3.0 - Flat, modern theme',
+        COLOR_SCHEME => 'Color Scheme',
+        LIGHT => 'Light',
+        DARK => 'Dark',
+        SAVE => 'Save',
+        ACCT_MENU => 'Menu',
+        SUBSCRIBE => 'Subscribe',
+        UNSUBSCRIBE => 'Unsubscribe',
+        BLOCK => 'Block',
+        UNBLOCK => 'Unblock',
+        MUTE => 'Mute',
+        UNMUTE => 'Unmute',
+        TAB_STATUSES => 'Statuses',
+        TAB_FOLLOWING => 'Following',
+        TAB_FOLLOWERS => 'Followers',
+        TAB_SCROBBLES => 'Scrobbles',
+        TAB_MEDIA => 'Media',
+        TAB_PINNED => 'Pinned',
+        FOLLOWS_YOU => 'Follows you!',
+        FOLLOW => 'Follow',
+        FOLLOW_PENDING => 'Follow pending',
+        FOLLOWING => 'Following!',
+        BLOCKED => 'You are blocked by this user.',
+        REPLY => 'Reply',
+        REPEAT => 'Repeat',
+        LIKE => 'Like',
+        QUICK => 'Quick',
+        VIEW => 'View',
+        IN_REPLY_TO => 'In reply to',
+        PAGE_NOT_FOUND => 'Content not found',
+        STATUS_NOT_FOUND => 'Status not found',
+        ACCOUNT_NOT_FOUND => 'Account not found',
+        VIS_PUBLIC => 'Public',
+        VIS_UNLISTED => 'Unlisted',
+        VIS_PRIVATE => 'Private',
+        VIS_DIRECT => 'Direct',
+        VIS_LOCAL => 'Local',
+        VIS_LIST => 'List',
+        LOGIN => 'Login',
+        REGISTER => 'Register',
+        USERNAME => 'Username',
+        PASSWORD => 'Password',
+        LOGIN_BTN => 'Login',
+        LOGIN_HEADER => 'Login / Register',
+        LOGIN_FAIL => 'Couldn\'t login',
+        NOTIF_LIKED => 'liked your status',
+        NOTIF_REACTED_WITH => 'reacted with %s',
+        NOTIF_REPEATED => 'repeated your status',
+        NOTIF_FOLLOW => 'followed you',
+        NOTIF_FOLLOW_REQUEST => 'wants to follow you',
+        NOTIF_POLL => 'poll results',
+        NOTIF_COMPACT_LIKED => 'liked',
+        NOTIF_COMPACT_REACTED_WITH => 'reacted',
+        NOTIF_COMPACT_REPEATED => 'repeated',
+        NOTIF_COMPACT_FOLLOW => 'followed',
+        COMPACT_FOLLOW_REQUEST => 'wants to follow',
+        NOTIF_COMPACT_POLL => 'poll',
+    },
+    # TODO bring over Spanish and Chinese
+);
+
+return 1;
diff --git a/perl/main.pl b/perl/main.pl
index a9072b3..77cac12 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -1,10 +1,31 @@
 use strict;
 use warnings;
+# Modules
+use Template;
+use l10n;
+
+my $template = Template->new(
+    {
+        INTERPOLATE => 1,
+        POST_CHOMP => 1,
+        EVAL_PERL => 1,
+        TRIM => 1
+    });
 
 sub base_page
 {
+    my ($ssn, $data) = @_;
+    my $result;
+
+    my $vars = {
+        #        L10N => L10N,
+        prefix => '',
+        lang => sub { $l10n::L10N{'EN_US'}{shift(@_)} },
+    };
+
+    $template->process(\$data, $vars, \$result) ||
+        return $template->error();
     
-    2 * 2;
+    $result;
 }
 
-print "Hello from Perl\n";
diff --git a/src/base_page.c b/src/base_page.c
index a47f2b8..cfc8518 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -33,14 +33,23 @@
 // Files
 #include "../static/index.ctmpl"
 #include "../static/quick_login.ctmpl"
+#include "../templates/main.ctt"
 
 #define BODY_STYLE "style=\"background:url('%s');\""
 
 void render_base_page(struct base_page* page, FCGX_Request* req, struct session* ssn, mastodont_t* api)
 {
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
+    XPUSHs(sv_2mortal(newSVpv(data_main_tt, 0)));
+    
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    char* cookie = GET_ENV("HTTP_COOKIE", req);
     enum l10n_locale locale = l10n_normalize(ssn->config.lang);
     char* theme_str = NULL;
     const char* login_string = "<a href=\"login\" id=\"login-header\">Login / Register</a>";
@@ -58,62 +67,62 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
 #define SIDEBAR_CSS_LEN 128
     char sidebar_css[SIDEBAR_CSS_LEN];
 
-    if (keyint(ssn->cookies.logged_in))
-        login_string = "";
+    /* if (keyint(ssn->cookies.logged_in)) */
+    /*     login_string = ""; */
 
-    if (ssn->config.background_url)
-    {
-        easprintf(&background_url_css, BODY_STYLE, ssn->config.background_url);
-    }
+    /* if (ssn->config.background_url) */
+    /* { */
+    /*     easprintf(&background_url_css, BODY_STYLE, ssn->config.background_url); */
+    /* } */
 
-    // If user is logged in
-    if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token))
-    {
-        account_sidebar_str = construct_account_sidebar(&(ssn->acct), NULL);
+    /* // If user is logged in */
+    /* if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token)) */
+    /* { */
+    /*     account_sidebar_str = construct_account_sidebar(&(ssn->acct), NULL); */
 
-        // Get / Show notifications on sidebar
-        if (ssn->config.notif_embed)
-        {
-            main_sidebar_str = (char*)sidebar_embed;
-        }
-        else {
-            struct mstdnt_get_notifications_args args = {
-                .exclude_types = 0,
-                .account_id = NULL,
-                .exclude_visibilities = 0,
-                .include_types = 0,
-                .with_muted = 1,
-                .max_id = NULL,
-                .min_id = NULL,
-                .since_id = NULL,
-                .offset = 0,
-                .limit = 8,
-            };
+    /*     // Get / Show notifications on sidebar */
+    /*     if (ssn->config.notif_embed) */
+    /*     { */
+    /*         main_sidebar_str = (char*)sidebar_embed; */
+    /*     } */
+    /*     else { */
+    /*         struct mstdnt_get_notifications_args args = { */
+    /*             .exclude_types = 0, */
+    /*             .account_id = NULL, */
+    /*             .exclude_visibilities = 0, */
+    /*             .include_types = 0, */
+    /*             .with_muted = 1, */
+    /*             .max_id = NULL, */
+    /*             .min_id = NULL, */
+    /*             .since_id = NULL, */
+    /*             .offset = 0, */
+    /*             .limit = 8, */
+    /*         }; */
         
-            if (mastodont_get_notifications(api,
-                                            &m_args,
-                                            &args,
-                                            &storage,
-                                            &notifs,
-                                            &notifs_len) == 0)
-            {
-                main_sidebar_str = construct_notifications_compact(ssn, api, notifs, notifs_len, NULL);
-            }
+    /*         if (mastodont_get_notifications(api, */
+    /*                                         &m_args, */
+    /*                                         &args, */
+    /*                                         &storage, */
+    /*                                         &notifs, */
+    /*                                         &notifs_len) == 0) */
+    /*         { */
+    /*             main_sidebar_str = construct_notifications_compact(ssn, api, notifs, notifs_len, NULL); */
+    /*         } */
 
-            mstdnt_cleanup_notifications(notifs, notifs_len);
-            mastodont_storage_cleanup(&storage);
-        }
-    }
-    else {
-        // Construct small login page
-        struct quick_login_template tdata = {
-            .prefix = config_url_prefix,
-            .username = L10N[locale][L10N_USERNAME],
-            .password = L10N[locale][L10N_PASSWORD],
-            .login = L10N[locale][L10N_LOGIN_BTN],
-        };
-        main_sidebar_str = tmpl_gen_quick_login(&tdata, NULL);
-    }
+    /*         mstdnt_cleanup_notifications(notifs, notifs_len); */
+    /*         mastodont_storage_cleanup(&storage); */
+    /*     } */
+    /* } */
+    /* else { */
+    /*     // Construct small login page */
+    /*     struct quick_login_template tdata = { */
+    /*         .prefix = config_url_prefix, */
+    /*         .username = L10N[locale][L10N_USERNAME], */
+    /*         .password = L10N[locale][L10N_PASSWORD], */
+    /*         .login = L10N[locale][L10N_LOGIN_BTN], */
+    /*     }; */
+    /*     main_sidebar_str = tmpl_gen_quick_login(&tdata, NULL); */
+    /* } */
 
     // Combine into sidebar
     easprintf(&sidebar_str, "%s%s",
@@ -180,27 +189,37 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
         .source_link_str = "Source code",
     };
     
-    size_t len;
-    char* data = tmpl_gen_index(&index_tmpl, &len);
+//    char* data = tmpl_gen_index(&index_tmpl, &len);
     
-    if (!data)
-    {
-        perror("malloc");
-        goto cleanup;
-    }
+    /* if (!data) */
+    /* { */
+    /*     perror("malloc"); */
+    /*     goto cleanup; */
+    /* } */
+
+    // Run function
+    PUTBACK;
+    call_pv("base_page", G_SCALAR);
+    SPAGAIN;
+
+    char* data = POPp;
     
-    send_result(req, NULL, "text/html", data, len);
+    send_result(req, NULL, "text/html", data, 0);
 
     // Cleanup
 /* cleanup_all: */
-    free(data);
+//    free(data);
 cleanup:
-    free(sidebar_str);
-    if (main_sidebar_str != sidebar_embed) free(main_sidebar_str);
-    free(account_sidebar_str);
-    free(background_url_css);
-    free(instance_str);
-    free(theme_str);
+    /* free(sidebar_str); */
+    /* if (main_sidebar_str != sidebar_embed) free(main_sidebar_str); */
+    /* free(account_sidebar_str); */
+    /* free(background_url_css); */
+    /* free(instance_str); */
+    /* free(theme_str); */
+
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
 }
 
 void send_result(FCGX_Request* req, char* status, char* content_type, char* data, size_t data_len)
@@ -216,7 +235,7 @@ void send_result(FCGX_Request* req, char* status, char* content_type, char* data
                  "Content-Length: %d\r\n\r\n",
                  status ? status : "200 OK",
                  content_type ? content_type : "text/html",
-                 data_len + 1);
+                 data_len);
 #ifdef SINGLE_THREADED
     puts(data);
 #else
diff --git a/src/base_page.h b/src/base_page.h
index 010e08b..48ca5f4 100644
--- a/src/base_page.h
+++ b/src/base_page.h
@@ -18,13 +18,13 @@
 
 #ifndef BASE_PAGE_H
 #define BASE_PAGE_H
+#include "session.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
 #include <mastodont.h>
 #include "l10n.h"
 #include "local_config.h"
 #include "path.h"
-#include "session.h"
 
 enum base_category
 {
diff --git a/src/main.c b/src/main.c
index 9939e37..c9c1ebb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,10 +47,14 @@
 #include "local_config_set.h"
 #include "global_cache.h"
 #include "conversations.h"
-#include "../perl/main.cpl"
 
 #define THREAD_COUNT 20
 
+// Allow dynamic loading for Perl
+static void xs_init (pTHX);
+
+EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
+
 /*******************
  *  Path handling  *
  ******************/
@@ -194,6 +198,12 @@ static void* cgi_start(void* arg)
     return NULL;
 }
 
+EXTERN_C void xs_init(pTHX)
+{
+       char *file = __FILE__;
+       newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+}
+
 int main(int argc, char **argv, char **env)
 {
     // Global init
@@ -205,9 +215,9 @@ int main(int argc, char **argv, char **env)
     perl = perl_alloc();
     perl_construct(perl);
     //char* perl_argv[] = { "", "-e", data_main_pl, NULL };
-    char* perl_argv[] = { "", "perl/main.pl", NULL };
+    char* perl_argv[] = { "", "-I", "perl/", "perl/main.pl", NULL };
 
-    perl_parse(perl, NULL, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
+    perl_parse(perl, xs_init, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
     PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
     perl_run(perl);
 
diff --git a/templates/main.ctt b/templates/main.ctt
new file mode 100644
index 0000000..b60dd43
--- /dev/null
+++ b/templates/main.ctt
@@ -0,0 +1,5 @@
+#ifndef __data_main_tt
+#define __data_main_tt
+static size_t data_main_tt_size = 5000;
+static const char data_main_tt[] = {0X3C,0X21,0X44,0X4F,0X43,0X54,0X59,0X50,0X45,0X20,0X68,0X74,0X6D,0X6C,0X3E,0XA,0X3C,0X68,0X74,0X6D,0X6C,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X5F,0X75,0X72,0X6C,0X20,0X7D,0X7D,0X3E,0XA,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X63,0X68,0X61,0X72,0X73,0X65,0X74,0X3D,0X22,0X75,0X74,0X66,0X2D,0X38,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X74,0X69,0X74,0X6C,0X65,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X69,0X74,0X6C,0X65,0X20,0X7D,0X7D,0X3C,0X2F,0X74,0X69,0X74,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X69,0X63,0X6F,0X6E,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X69,0X6D,0X61,0X67,0X65,0X2F,0X70,0X6E,0X67,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X66,0X61,0X76,0X69,0X63,0X6F,0X6E,0X2E,0X70,0X6E,0X67,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X73,0X74,0X79,0X6C,0X65,0X73,0X68,0X65,0X65,0X74,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X2F,0X63,0X73,0X73,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X2E,0X63,0X73,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X68,0X65,0X6D,0X65,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X76,0X69,0X65,0X77,0X70,0X6F,0X72,0X74,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X77,0X69,0X64,0X74,0X68,0X3D,0X64,0X65,0X76,0X69,0X63,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X2C,0X20,0X69,0X6E,0X69,0X74,0X69,0X61,0X6C,0X2D,0X73,0X63,0X61,0X6C,0X65,0X3D,0X31,0X2E,0X30,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X64,0X65,0X73,0X63,0X72,0X69,0X70,0X74,0X69,0X6F,0X6E,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X69,0X74,0X6C,0X65,0X20,0X7D,0X7D,0X20,0X69,0X73,0X20,0X61,0X20,0X64,0X65,0X63,0X65,0X6E,0X74,0X72,0X61,0X6C,0X69,0X7A,0X65,0X64,0X20,0X73,0X6F,0X63,0X69,0X61,0X6C,0X20,0X6D,0X65,0X64,0X69,0X61,0X20,0X70,0X6C,0X61,0X74,0X66,0X6F,0X72,0X6D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X63,0X73,0X73,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X3C,0X62,0X6F,0X64,0X79,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X2D,0X70,0X61,0X67,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X65,0X72,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X32,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X32,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X36,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X36,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X38,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X38,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X22,0X3E,0X3C,0X69,0X6D,0X67,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X5F,0X6C,0X6F,0X67,0X6F,0X2E,0X70,0X6E,0X67,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X34,0X32,0X22,0X3E,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X69,0X6E,0X66,0X6F,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X6E,0X61,0X6D,0X65,0X20,0X7D,0X7D,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X70,0X61,0X74,0X68,0X20,0X64,0X3D,0X22,0X4D,0X32,0X32,0X20,0X31,0X37,0X48,0X32,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X2D,0X33,0X56,0X39,0X61,0X37,0X20,0X37,0X20,0X30,0X20,0X30,0X20,0X31,0X20,0X31,0X34,0X20,0X30,0X76,0X35,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X20,0X33,0X7A,0X6D,0X2D,0X38,0X2E,0X32,0X37,0X20,0X34,0X61,0X32,0X20,0X32,0X20,0X30,0X20,0X30,0X20,0X31,0X2D,0X33,0X2E,0X34,0X36,0X20,0X30,0X22,0X3E,0X3C,0X2F,0X70,0X61,0X74,0X68,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X2D,0X62,0X74,0X6E,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X63,0X69,0X72,0X63,0X6C,0X65,0X20,0X63,0X78,0X3D,0X22,0X31,0X31,0X22,0X20,0X63,0X79,0X3D,0X22,0X31,0X31,0X22,0X20,0X72,0X3D,0X22,0X38,0X22,0X3E,0X3C,0X2F,0X63,0X69,0X72,0X63,0X6C,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X78,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X2D,0X63,0X6F,0X6E,0X74,0X61,0X69,0X6E,0X65,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X63,0X6E,0X74,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X66,0X6F,0X72,0X6D,0X20,0X61,0X63,0X74,0X69,0X6F,0X6E,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X73,0X65,0X61,0X72,0X63,0X68,0X22,0X20,0X6D,0X65,0X74,0X68,0X6F,0X64,0X3D,0X22,0X67,0X65,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X6C,0X65,0X66,0X74,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X69,0X6E,0X70,0X75,0X74,0X62,0X6F,0X78,0X22,0X20,0X70,0X6C,0X61,0X63,0X65,0X68,0X6F,0X6C,0X64,0X65,0X72,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X50,0X4C,0X41,0X43,0X45,0X48,0X4F,0X4C,0X44,0X45,0X52,0X27,0X29,0X20,0X25,0X5D,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X22,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X71,0X22,0X3E,0X3C,0X21,0X2D,0X2D,0X20,0X69,0X20,0X68,0X61,0X74,0X65,0X20,0X48,0X54,0X4D,0X4C,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X2D,0X2D,0X3E,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X73,0X75,0X62,0X6D,0X69,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X74,0X6E,0X20,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X20,0X76,0X61,0X6C,0X75,0X65,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X42,0X55,0X54,0X54,0X4F,0X4E,0X27,0X29,0X20,0X25,0X5D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X66,0X6F,0X72,0X6D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X65,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X61,0X62,0X6C,0X65,0X20,0X69,0X64,0X3D,0X22,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X75,0X69,0X2D,0X74,0X61,0X62,0X6C,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X61,0X76,0X69,0X67,0X61,0X74,0X69,0X6F,0X6E,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X68,0X6F,0X6D,0X65,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X48,0X4F,0X4D,0X45,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X6F,0X63,0X61,0X6C,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X6F,0X63,0X61,0X6C,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X4F,0X43,0X41,0X4C,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X45,0X44,0X45,0X52,0X41,0X54,0X45,0X44,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4E,0X4F,0X54,0X49,0X46,0X49,0X43,0X41,0X54,0X49,0X4F,0X4E,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X69,0X73,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X69,0X73,0X74,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X49,0X53,0X54,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X41,0X56,0X4F,0X55,0X52,0X49,0X54,0X45,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X42,0X4F,0X4F,0X4B,0X4D,0X41,0X52,0X4B,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X64,0X69,0X72,0X65,0X63,0X74,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X64,0X69,0X72,0X65,0X63,0X74,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X44,0X49,0X52,0X45,0X43,0X54,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X68,0X61,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X68,0X61,0X74,0X73,0X22,0X3E,0X43,0X68,0X61,0X74,0X73,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X43,0X4F,0X4E,0X46,0X49,0X47,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X69,0X6E,0X73,0X74,0X61,0X6E,0X63,0X65,0X5F,0X70,0X61,0X6E,0X65,0X6C,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6D,0X69,0X6E,0X69,0X2D,0X6C,0X69,0X6E,0X6B,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X62,0X6F,0X75,0X74,0X5F,0X6C,0X69,0X6E,0X6B,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X2F,0X6C,0X69,0X63,0X65,0X6E,0X73,0X65,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X6C,0X69,0X63,0X65,0X6E,0X73,0X65,0X5F,0X6C,0X69,0X6E,0X6B,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X68,0X74,0X74,0X70,0X73,0X3A,0X2F,0X2F,0X66,0X6F,0X73,0X73,0X69,0X6C,0X2E,0X6E,0X65,0X6B,0X6F,0X62,0X69,0X74,0X2E,0X6E,0X65,0X74,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X6F,0X75,0X72,0X63,0X65,0X5F,0X6C,0X69,0X6E,0X6B,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X44,0X69,0X73,0X70,0X6C,0X61,0X79,0X20,0X66,0X6F,0X72,0X20,0X70,0X6F,0X73,0X74,0X73,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X6D,0X61,0X69,0X6E,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X61,0X6E,0X64,0X20,0X73,0X75,0X63,0X68,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X61,0X62,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X6F,0X75,0X72,0X63,0X65,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X6D,0X61,0X69,0X6E,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X65,0X6D,0X6F,0X6A,0X69,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X3C,0X2F,0X62,0X6F,0X64,0X79,0X3E,0XA,0X3C,0X2F,0X68,0X74,0X6D,0X6C,0X3E,0XA,0};
+#endif
diff --git a/templates/main.tt b/templates/main.tt
new file mode 100644
index 0000000..2e26ff7
--- /dev/null
+++ b/templates/main.tt
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html {{ %s : background_url }}>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ %s : title }}</title>
+    <link rel="icon" type="image/png" href="/favicon.png">
+    <link rel="stylesheet" type="text/css" href="/treebird.css">
+    {{ %s : theme_str }}
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="{{ %s : title }} is a decentralized social media platform">
+    <style>
+      {{ %s : sidebar_css }}
+    </style>
+  </head>
+  <body>
+    <div id="main-page">
+      <header id="navbar">
+        <label for="leftbar-show">
+          <svg class="leftbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
+        </label>
+        <a href="{{ %s : prefix }}/"><img src="/treebird_logo.png" height="42"></a>
+        <span class="info">{{ %s : name }}</span>
+        <label for="rightbar-show">
+          <svg class="rightbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"></path></svg>
+        </label>
+        <label for="searchbar-show">
+          <svg class="search-btn-show" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
+        </label>
+        <input type="checkbox" class="hidden" id="searchbar-show">
+        <div id="navbar-right-container">
+          <div id="navbar-right">
+            {{ %s : sidebar_cnt }}
+            <!-- Searchbox -->
+            <form action="{{ %s : prefix }}/search" method="get">
+              <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><!-- i hate HTML
+                                                                                                                                           --><input type="submit" class="btn group group-right" value="[% lang('SEARCH_BUTTON') %]">
+            </form>
+          </div>
+        </div>
+      </header>
+      <input type="checkbox" id="leftbar-show" class="hidden">
+      <input type="checkbox" id="rightbar-show" class="hidden">
+      <table id="content" class="ui-table">
+        <!-- Navigation -->
+        <tr>
+          <td id="leftbar" class="sidebar">
+            <ul>
+              <li><a class="sidebarbtn {{ %s : active_home }}" href="$prefix/">[% lang('HOME') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_local }}" href="$prefix/local/">[% lang('LOCAL') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_federated }}" href="$prefix/federated/">[% lang('FEDERATED') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_notifications }}" href="$prefix/notifications">[% lang('NOTIFICATIONS') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_lists }}" href="$prefix/lists">[% lang('LISTS') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_favourites }}" href="$prefix/favourites">[% lang('FAVOURITES') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_bookmarks }}" href="$prefix/bookmarks">[% lang('BOOKMARKS') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_direct }}" href="$prefix/direct">[% lang('DIRECT') %]</a></li>
+              <li><a class="sidebarbtn {{ %s : active_chats }}" href="$prefix/chats">Chats</a></li>
+              <li><a class="sidebarbtn {{ %s : active_config }}" href="$prefix/config">[% lang('CONFIG') %]</a></li>
+            </ul>
+            {{ %s : sidebar_leftbar }}
+            {{ %s : instance_panel }}
+            <div class="mini-links">
+              <a href="{{%s:prefix}}/about">{{ %s : about_link_str }}</a>
+              <span class="bullet-separate">&bull;</span>
+              <a href="{{%s:prefix}}/about/license">{{ %s : license_link_str }}</a>
+              <span class="bullet-separate">&bull;</span>
+              <a href="https://fossil.nekobit.net/treebird">{{ %s : source_link_str }}</a>
+            </div>
+          </td>
+          
+          <!-- Display for posts -->
+          <td id="main">
+            {{ %s : main }}
+          </td>
+
+          <!-- Notifications and such -->
+          <td id="rightbar" class="sidebar">
+            {{ %s : sidebar_rightbar }}
+          </td>
+        </tr>
+      </table>
+    </div>
+    
+    <!-- Source -->
+    <script src="/js/main.js"></script>
+    <script src="/js/emoji.js"></script>
+  </body>
+</html>

From bba2ad9cdad7c7c6a82bd4c020d5e7645e4995d5 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 23 Jul 2022 05:32:17 +0000
Subject: [PATCH 005/143] More perl shit

FossilOrigin-Name: 3e3d09e82d3730e070a60b59be3c4ad69c1f3c965c3bf027673e9a3811825eb6
---
 perl/l10n.pm       |  2 ++
 perl/main.pl       | 11 +++++----
 src/cookie.c       | 32 ++++++++++++++++++++++++++
 src/cookie.h       |  3 +++
 src/local_config.c | 48 +++++++++++++++++++++++++++++++++++++++
 src/local_config.h |  3 +++
 src/query.c        | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 src/query.h        |  5 +++++
 src/session.c      | 45 +++++--------------------------------
 9 files changed, 160 insertions(+), 45 deletions(-)
 create mode 100644 src/local_config.c

diff --git a/perl/l10n.pm b/perl/l10n.pm
index 67c50fc..e69fee3 100644
--- a/perl/l10n.pm
+++ b/perl/l10n.pm
@@ -1,5 +1,7 @@
 package l10n;
 
+use Exporter 'import';
+
 our @EXPORT = qw( %L10N );
 
 our %L10N = (
diff --git a/perl/main.pl b/perl/main.pl
index 77cac12..548227c 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 # Modules
 use Template;
-use l10n;
+use l10n qw( %L10N );
 
 my $template = Template->new(
     {
@@ -17,13 +17,12 @@ sub base_page
     my ($ssn, $data) = @_;
     my $result;
 
-    my $vars = {
-        #        L10N => L10N,
+    my %vars = (
         prefix => '',
-        lang => sub { $l10n::L10N{'EN_US'}{shift(@_)} },
-    };
+        lang => sub { $L10N{'EN_US'}->{shift(@_)} },
+    );
 
-    $template->process(\$data, $vars, \$result) ||
+    $template->process(\$data, \%vars, \$result) ||
         return $template->error();
     
     $result;
diff --git a/src/cookie.c b/src/cookie.c
index 6be7e9a..dec504e 100644
--- a/src/cookie.c
+++ b/src/cookie.c
@@ -164,3 +164,35 @@ int cookie_get_val(char* src, char* key, struct http_cookie_info* info)
 
     return 1;
 }
+
+HV* perlify_cookies(struct cookie_values* cookies)
+{
+    HV* ssn_cookies_hv = newHV();
+
+    hv_stores(ssn_cookies_hv, "lang", newSViv(keyint(cookies->lang)));
+    hv_stores(ssn_cookies_hv, "interact_img", newSViv(keyint(cookies->interact_img)));
+    hv_stores(ssn_cookies_hv, "themeclr", newSViv(keyint(cookies->themeclr)));
+    hv_stores(ssn_cookies_hv, "jsactions", newSViv(keyint(cookies->jsactions)));
+    hv_stores(ssn_cookies_hv, "jsreply", newSViv(keyint(cookies->jsreply)));
+    hv_stores(ssn_cookies_hv, "jslive", newSViv(keyint(cookies->jslive)));
+    hv_stores(ssn_cookies_hv, "js", newSViv(keyint(cookies->js)));
+    hv_stores(ssn_cookies_hv, "interact_img", newSViv(keyint(cookies->interact_img)));
+    hv_stores(ssn_cookies_hv, "statattachments", newSViv(keyint(cookies->stat_attachments)));
+    hv_stores(ssn_cookies_hv, "statgreentexts", newSViv(keyint(cookies->stat_greentexts)));
+    hv_stores(ssn_cookies_hv, "statdope", newSViv(keyint(cookies->stat_dope)));
+    hv_stores(ssn_cookies_hv, "statoneclicksoftware", newSViv(keyint(cookies->stat_oneclicksoftware)));
+    hv_stores(ssn_cookies_hv, "statemojolikes", newSViv(keyint(cookies->stat_emojo_likes)));
+    hv_stores(ssn_cookies_hv, "stathidemuted", newSViv(keyint(cookies->stat_hide_muted)));
+    hv_stores(ssn_cookies_hv, "instanceshowshoutbox", newSViv(keyint(cookies->instance_show_shoutbox)));
+    hv_stores(ssn_cookies_hv, "instancepanel", newSViv(keyint(cookies->instance_panel)));
+    hv_stores(ssn_cookies_hv, "notifembed", newSViv(keyint(cookies->notif_embed)));
+    hv_stores(ssn_cookies_hv, "access_token", newSVpv(keystr(cookies->access_token), 0));
+    hv_stores(ssn_cookies_hv, "logged_in", newSVpv(keystr(cookies->logged_in), 0));
+    hv_stores(ssn_cookies_hv, "theme", newSVpv(keystr(cookies->theme), 0));
+    hv_stores(ssn_cookies_hv, "instance_url", newSVpv(keystr(cookies->instance_url), 0));
+    hv_stores(ssn_cookies_hv, "background_url", newSVpv(keystr(cookies->background_url), 0));
+    hv_stores(ssn_cookies_hv, "client_id", newSVpv(keystr(cookies->client_id), 0));
+    hv_stores(ssn_cookies_hv, "client_secret", newSVpv(keystr(cookies->client_secret), 0));
+
+    return ssn_cookies_hv;
+}
diff --git a/src/cookie.h b/src/cookie.h
index a9b4e39..77ace71 100644
--- a/src/cookie.h
+++ b/src/cookie.h
@@ -19,6 +19,7 @@
 #ifndef COOKIE_H
 #define COOKIE_H
 #include <stddef.h>
+#include "global_perl.h"
 #include "key.h"
 
 struct cookie_values
@@ -61,4 +62,6 @@ char* parse_cookies(char* begin, struct http_cookie_info* info);
 char* read_cookies_env(FCGX_Request* req, struct cookie_values* cookies);
 int cookie_get_val(char* src, char* key, struct http_cookie_info* info);
 
+HV* perlify_cookies(struct cookie_values* cookies);
+
 #endif // COOKIE_H
diff --git a/src/local_config.c b/src/local_config.c
new file mode 100644
index 0000000..2bfc3a5
--- /dev/null
+++ b/src/local_config.c
@@ -0,0 +1,48 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "global_perl.h"
+#include "local_config.h"
+
+HV* perlify_config(struct local_config* config)
+{
+    HV* ssn_config_hv = newHV();
+
+    hv_stores(ssn_config_hv, "logged_in", newSVpv(config->logged_in, 0));
+    hv_stores(ssn_config_hv, "theme", newSVpv(config->theme, 0));
+    hv_stores(ssn_config_hv, "background_url", newSVpv(config->background_url, 0));
+    hv_stores(ssn_config_hv, "lang", newSViv(config->lang));
+    hv_stores(ssn_config_hv, "themeclr", newSViv(config->themeclr));
+    hv_stores(ssn_config_hv, "jsactions", newSViv(config->jsactions));
+    hv_stores(ssn_config_hv, "jslive", newSViv(config->jslive));
+    hv_stores(ssn_config_hv, "js", newSViv(config->js));
+    hv_stores(ssn_config_hv, "interact_img", newSViv(config->interact_img));
+    hv_stores(ssn_config_hv, "stat_attachments", newSViv(config->stat_attachments));
+    hv_stores(ssn_config_hv, "stat_greentexts", newSViv(config->stat_greentexts));
+    hv_stores(ssn_config_hv, "stat_dope", newSViv(config->stat_dope));
+    hv_stores(ssn_config_hv, "stat_oneclicksoftware", newSViv(config->stat_oneclicksoftware));
+    hv_stores(ssn_config_hv, "stat_emojo_likes", newSViv(config->stat_emojo_likes));
+    hv_stores(ssn_config_hv, "stat_hide_muted", newSViv(config->stat_hide_muted));
+    hv_stores(ssn_config_hv, "instance_show_shoutbox", newSViv(config->instance_show_shoutbox));
+    hv_stores(ssn_config_hv, "instance_panel", newSViv(config->instance_panel));
+    hv_stores(ssn_config_hv, "notif_embed", newSViv(config->notif_embed));
+    hv_stores(ssn_config_hv, "sidebar_opacity", newSViv(config->sidebar_opacity));
+    
+    return ssn_config_hv;
+}
+
diff --git a/src/local_config.h b/src/local_config.h
index 3eb092f..e1b0578 100644
--- a/src/local_config.h
+++ b/src/local_config.h
@@ -18,6 +18,7 @@
 
 #ifndef LOCAL_CONFIG_H
 #define LOCAL_CONFIG_H
+#include "global_perl.h"
 #include "query.h"
 
 struct local_config
@@ -44,4 +45,6 @@ struct local_config
     int sidebar_opacity;
 };
 
+HV* perlify_config(struct local_config* config);
+
 #endif // LOCAL_CONFIG_H
diff --git a/src/query.c b/src/query.c
index cc62c1f..7968cce 100644
--- a/src/query.c
+++ b/src/query.c
@@ -262,3 +262,59 @@ void free_files(struct file_array* files)
     }
     free(content);
 }
+
+HV* perlify_post_values(struct post_values* post)
+{
+    HV* ssn_post_hv = newHV();
+
+    // This ugly...
+    hv_stores(ssn_post_hv, "theme", newSVpv(keystr(post->theme), 0));
+    hv_stores(ssn_post_hv, "themeclr", newSViv(keyint(post->themeclr)));
+    hv_stores(ssn_post_hv, "lang", newSViv(keyint(post->lang)));
+    hv_stores(ssn_post_hv, "title", newSViv(keyint(post->title)));
+    hv_stores(ssn_post_hv, "jsactions", newSViv(keyint(post->jsactions)));
+    hv_stores(ssn_post_hv, "jsreply", newSViv(keyint(post->jsreply)));
+    hv_stores(ssn_post_hv, "jslive", newSViv(keyint(post->jslive)));
+    hv_stores(ssn_post_hv, "js", newSViv(keyint(post->js)));
+    hv_stores(ssn_post_hv, "interact_img", newSViv(keyint(post->interact_img)));
+    hv_stores(ssn_post_hv, "stat_attachments", newSViv(keyint(post->stat_attachments)));
+    hv_stores(ssn_post_hv, "stat_greentexts", newSViv(keyint(post->stat_greentexts)));
+    hv_stores(ssn_post_hv, "stat_dope", newSViv(keyint(post->stat_dope)));
+    hv_stores(ssn_post_hv, "stat_oneclicksoftware", newSViv(keyint(post->stat_oneclicksoftware)));
+    hv_stores(ssn_post_hv, "stat_emojo_likes", newSViv(keyint(post->stat_emojo_likes)));
+    hv_stores(ssn_post_hv, "stat_hide_muted", newSViv(keyint(post->stat_hide_muted)));
+    hv_stores(ssn_post_hv, "instance_show_shoutbox", newSViv(keyint(post->instance_show_shoutbox)));
+    hv_stores(ssn_post_hv, "instance_panel", newSViv(keyint(post->instance_panel)));
+    hv_stores(ssn_post_hv, "notif_embed", newSViv(keyint(post->notif_embed)));
+    hv_stores(ssn_post_hv, "set", newSViv(keyint(post->set)));
+    hv_stores(ssn_post_hv, "only_media", newSViv(keyint(post->only_media)));
+    hv_stores(ssn_post_hv, "replies_only", newSViv(keyint(post->replies_only)));
+    hv_stores(ssn_post_hv, "replies_policy", newSViv(keyint(post->replies_policy)));
+    hv_stores(ssn_post_hv, "emojoindex", newSViv(keyint(post->emojoindex)));
+    hv_stores(ssn_post_hv, "sidebar_opacity", newSViv(keyint(post->sidebar_opacity)));
+    hv_stores(ssn_post_hv, "file_ids", newSVpv(keystr(post->file_ids), 0));
+    hv_stores(ssn_post_hv, "content", newSVpv(keystr(post->content), 0));
+    hv_stores(ssn_post_hv, "itype", newSVpv(keystr(post->itype), 0));
+    hv_stores(ssn_post_hv, "id", newSVpv(keystr(post->id), 0));
+    hv_stores(ssn_post_hv, "username", newSVpv(keystr(post->username), 0));
+    hv_stores(ssn_post_hv, "password", newSVpv(keystr(post->password), 0));
+    hv_stores(ssn_post_hv, "replyid", newSVpv(keystr(post->replyid), 0));
+    hv_stores(ssn_post_hv, "visibility", newSVpv(keystr(post->visibility), 0));
+    hv_stores(ssn_post_hv, "instance", newSVpv(keystr(post->instance), 0));
+    hv_stores(ssn_post_hv, "min_id", newSVpv(keystr(post->min_id), 0));
+    hv_stores(ssn_post_hv, "max_id", newSVpv(keystr(post->max_id), 0));
+    hv_stores(ssn_post_hv, "start_id", newSVpv(keystr(post->start_id), 0));
+
+    return ssn_post_hv;
+}
+
+HV* perlify_get_values(struct get_values* get)
+{
+    HV* ssn_query_hv = newHV();
+
+    hv_stores(ssn_query_hv, "offset", newSVpv(keystr(get->offset), 0));
+    hv_stores(ssn_query_hv, "query", newSVpv(keystr(get->query), 0));
+    hv_stores(ssn_query_hv, "code", newSVpv(keystr(get->code), 0));
+    
+    return ssn_query_hv;
+}
diff --git a/src/query.h b/src/query.h
index 8354ccb..b78dfde 100644
--- a/src/query.h
+++ b/src/query.h
@@ -18,6 +18,7 @@
 
 #ifndef QUERY_H
 #define QUERY_H
+#include "global_perl.h"
 #include <fcgi_stdio.h>
 #include <stddef.h>
 #include "key.h"
@@ -89,4 +90,8 @@ char* try_handle_post(FCGX_Request* req, void (*call)(struct http_query_info*, v
 
 void free_files(struct file_array* files);
 
+// Perl stuff
+HV* perlify_post_values(struct post_values* post);
+HV* perlify_get_values(struct get_values* get);
+
 #endif // QUERY_H
diff --git a/src/session.c b/src/session.c
index 44f1f3d..ef7557b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -30,52 +30,19 @@ const char* const get_token(struct session* ssn)
     return keystr(ssn->cookies.access_token);
 }
 
-static HV* perlify_post_values(struct post_values* post)
-{
-}
-
-static HV* perlify_get_values(struct get_values* get)
-{
-}
-
-static HV* perlify_config(struct local_config* config)
-{
-    HV* ssn_config_hv = newHV();
-
-    hv_stores(ssn_config_hv, "logged_in", newSVpv(config->logged_in, 0));
-    hv_stores(ssn_config_hv, "theme", newSVpv(config->theme, 0));
-    hv_stores(ssn_config_hv, "background_url", newSVpv(config->background_url, 0));
-    hv_stores(ssn_config_hv, "lang", newSViv(config->lang));
-    hv_stores(ssn_config_hv, "themeclr", newSViv(config->themeclr));
-    hv_stores(ssn_config_hv, "jsactions", newSViv(config->jsactions));
-    hv_stores(ssn_config_hv, "jslive", newSViv(config->jslive));
-    hv_stores(ssn_config_hv, "js", newSViv(config->js));
-    hv_stores(ssn_config_hv, "interact_img", newSViv(config->interact_img));
-    hv_stores(ssn_config_hv, "stat_attachments", newSViv(config->stat_attachments));
-    hv_stores(ssn_config_hv, "stat_greentexts", newSViv(config->stat_greentexts));
-    hv_stores(ssn_config_hv, "stat_dope", newSViv(config->stat_dope));
-    hv_stores(ssn_config_hv, "stat_oneclicksoftware", newSViv(config->stat_oneclicksoftware));
-    hv_stores(ssn_config_hv, "stat_emojo_likes", newSViv(config->stat_emojo_likes));
-    hv_stores(ssn_config_hv, "stat_hide_muted", newSViv(config->stat_hide_muted));
-    hv_stores(ssn_config_hv, "instance_show_shoutbox", newSViv(config->instance_show_shoutbox));
-    hv_stores(ssn_config_hv, "instance_panel", newSViv(config->instance_panel));
-    hv_stores(ssn_config_hv, "notif_embed", newSViv(config->notif_embed));
-    hv_stores(ssn_config_hv, "sidebar_opacity", newSViv(config->sidebar_opacity));
-    
-    return ssn_config_hv;
-}
-
 HV* perlify_session(struct session* ssn)
 {
     HV* ssn_hv = newHV();
     hv_stores(ssn_hv, "logged_in", newSVuv(ssn->logged_in));
-//    HV* ssn_post_values = perlify_post_values(&(ssn->post));
-//    HV* ssn_get_values = perlify_get_values(&(ssn->query));
-//    HV* ssn_get_values = perlify_cookie_values(&(ssn->query))
+    HV* ssn_post_values = perlify_post_values(&(ssn->post));
+    HV* ssn_get_values = perlify_get_values(&(ssn->query));
+    HV* ssn_cookie_values = perlify_cookies(&(ssn->cookies));
     // Config
     HV* ssn_config = perlify_config(&(ssn->config));
     hv_stores(ssn_hv, "config", newRV_inc((SV*)ssn_config));
-    
+    hv_stores(ssn_hv, "cookies", newRV_inc((SV*)ssn_cookie_values));
+    hv_stores(ssn_hv, "query", newRV_inc((SV*)ssn_get_values));
+    hv_stores(ssn_hv, "post", newRV_inc((SV*)ssn_post_values));
 
     return ssn_hv;
 }

From 5f6c7b9108d2d2ed28db0b10c1be5b795f88724e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 24 Jul 2022 01:03:57 +0000
Subject: [PATCH 006/143] Progress

FossilOrigin-Name: 52629add8a196eb6dcf025cee092cfa0a3104a54ef4e9782ddc212310cca8078
---
 .fossil-settings/ignore-glob |   1 +
 Makefile                     |  10 +--
 ctemplate                    | Bin 0 -> 16664 bytes
 perl/main.pl                 |   6 +-
 src/base_page.c              | 120 +----------------------------------
 templates/main.ctt           |   4 +-
 templates/main.tt            |  31 +++++----
 7 files changed, 35 insertions(+), 137 deletions(-)
 create mode 100755 ctemplate

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 0cf097b..3ed6ae9 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -1,4 +1,5 @@
 template
+ctemplate
 filec
 emojitoc
 **/*.cgi
diff --git a/Makefile b/Makefile
index 3c42bb7..bde286c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,9 @@ MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 all: $(MASTODONT_DIR) dep_build $(TARGET)
 apache: all apache_start
 
-$(TARGET): filec template $(TMPLS_C) $(TMPLS) $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ) $(OBJ) $(HEADERS) 
+$(TARGET): filec ctemplate $(TMPLS_C) $(TMPLS) $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ) $(OBJ) $(HEADERS) 
 	$(CC) -o $(TARGET) $(OBJ) $(PAGES_C_OBJ) $(LDFLAGS)
 
-template: src/template/main.o
-	$(CC) $(LDFLAGS) -o template $<
-
 filec: src/file-to-c/main.o
 	$(CC) -o filec $<
 
@@ -40,11 +37,14 @@ emojitoc: scripts/emoji-to.o
 # Redirect stdout and stderr into separate contents as a hack
 # Let bash do the work :)
 $(PAGES_DIR)/%.ctmpl: $(PAGES_DIR)/%.tmpl $(TMPLS)
-	./template $< $(notdir $*) 2> $(PAGES_DIR)/$(notdir $*).c 1> $@
+	./ctemplate $< $(notdir $*) 2> $(PAGES_DIR)/$(notdir $*).c 1> $@
 
 $(TMPL_DIR)/%.ctt: $(TMPL_DIR)/%.tt
 	./filec $< data_$(notdir $*)_tt > $@
 
+ctemplate: src/template/main.o
+	$(CC) $(LDFLAGS) -o ctemplate $<
+
 $(MASTODONT_DIR): 
 	cd ..; fossil clone $(MASTODONT_URL) || true
 	cd treebird; ln -s ../mastodont-c .
diff --git a/ctemplate b/ctemplate
new file mode 100755
index 0000000000000000000000000000000000000000..e09e9f1eb84880f9be797c688a0c649e3a3795fa
GIT binary patch
literal 16664
zcmeHOe{@q-p1)~})FMeioGDl&LaRk-Xr-_PM3T}UFHS&25EL<%G$9$%v?ebC0$Qiw
z5@WPFuIq7}J?@O_s5>*_tcSz0idB9(yX%2j#|52HM$moP@}vHMMMbio?|t{CFOO!<
zp4qeW$DUqz?|Z+W`~80Jz2E!e-S_hC{Y{?c0*i&oRLE{%#MO+}5vM44YNp75I9WX#
ziTf37Ji7>d5y$j$r%q6+r$Ys~v{>MUprltunL%i|4l_w*3yG3mzSJ{PFOig$>OAQU
zqpaY~bo?c{oTRcmTc2GoXC~UnjWQ;wQICA{Lba~<!kk<x`&}jaFZIY>q_<t@Z5Miy
z+J!$QmHs53&{Z$&nQ0BmC`oG83kp3mwR0_&?Y8v&EuW}ue@cA|g<f!?ZrDu2qCQDw
zeK$jo{PI6da+nv1`tps#GT~22X}l>-4To0FsGAyYs}6@E@wL@!>t|HYsB^?R9M|!3
zYL^`s4S&mmC0H|-Uc#h)fr+OwY7>={JSB3us2(c`YeDeCK_46afTi@s^4pd2VV2?|
zrxOq_9}7AT*X6iK=L%frG(iA%L9Y~)Ts}$UD+DD{iR&uCUoB`A=<55Q-Y{+D2PgJf
zHox`r?;Y(ueD|{Qk+c4K#4nx;*3JApS-$$>dG8(cztcX=`||5k_a|Tbr=yQ=nAh~%
z<JTVlVfpLR3s2v(_lM<{S3jO6Ob$w7K*d&*Q@$z>{!AYHukzr(%7fDg3|8;o=fO|s
z!MpO{?RoGcdGLSBga2b5T+4$$k_SJP2Y)vY{?k18o;*0sZ96V=qWNw&gW#v+!4Cr;
zY+P1y+{!vfA%oP*?~MHoDj3bI+2<9_aY`<M_gt#;%XGpP0v|;y(XIouE-AePyp)Y)
zy-v<%Z%+faW94l%;X&Y3Z`XHq(I<qVonS{9?8trgDQ^ElJI#=nZPqR6cdxL2V2sX3
z!Bg5M@Vf-wsl)8=xc#y0fKvd1xH(>SLBG}rJ9c45JZ9K^0$=zY-M}R9lx7LMU-(n*
zACF3TfjhZ0ZeH)I_Kt`*rnW{^ua|k<i|2dW{89g^P)zkl7tfy;?uhsox2_EP^|HZB
zyuP)q-ashQ8V=nHK`(Y?pRn298j7%h>JNumAm;b4Mrmg>6j1|SUyvA|x~|jjUFi*X
z_*hJh`r11=2}X(FKa2WX!&KPmk48H<8ur6t)bED`ni_?XfWc&-Gp@#1U`;fn`dOf(
z(;t~p$J%up&}waC0bjTy=4aH%cr;88i#lRDeNq2))%C>J5FhZZ3T2sg%FW<9dJavC
ztcfvS(7zTHGOxd_Rc(cjZbHA?LJ@B~=5J%_>WG*6$9Vg^s=vK6+=^yFc})ymYK_MH
zUKOBM?O08{3WfbK-GyXMcOh&?+R(|Bv6uj)S+#>4)Z%eB%=2F7m^P5B%Vw{0OwZ=0
zp`S<vc%te5iZ~sX<t1JS89XWRuTW5((|I#SQ_q4^O${=%zfig~6v7E_7~3tdS08&4
z$ATjEj^N|tLKoAM^|0X8vBVd!Pry@>=P<c0onqc@6$?P({bCc^?&NAr;*vi!SI1E~
zyHd~c`w;_9Win|7Tr4?W)NjBqlfs~94Y*i}yj1Q_bncj7kS}xU44oZBS2<ue;03w}
zzgHP>arEPOjRBW?BNfyeaH?A-r&G^Sy>!W>IQ1N1(szU`bkbdy#lU3KGN+y;`I0Qk
z*j)yEgaHp4aB+0!rJV*G6D6D08gOeCWvt79+YI;?11{$t755l$@hBpgJ!Qa0b40&A
zYrw@+;{`7maPbJy6^8CZ9{4kQK<PeStR#nhGL<o9bFW&EIiPg!F5Z=GL1y~LD9ThG
z!`(K)i5&4kDo-EDAXUCkJZ(AY1DyX2@dd>9a{kxE(-xE7%K5j5r>!OZEa!I+Pg_d5
zhx5N8p0>_(7w2Chp0<T_C+B}cJZ&lIyEy+e@wAns7jph_;%N&>J30Rl@w9cMYdHS{
z;%UoB+c|$P@w8Q>OF17Up0<cI<NWuDw-Mie9zf+v;%Q4rAL0D%#M4%gKEU}!#M2g#
z?&W;c!C0UNJWsAAuEp-e=_R-5j=!&1NlmYSb!{4KD~WyX#BOanyos!m*rm-U6yp;2
zB>tcz-rq@n=0$t7MN~9%SKQ%A{D-y&Rk@QJOO?dQy^Z5DOnVL<RT8JPb110or7>N;
z!gYsh#V#c|az9$MgB~inxzwCrpu1WFZ@?+-*U+FAu)epI)SM(0EzLsPYEQTm2k%r8
zA1mF*`WG&4s_m^Mu}UasE_<|^u`dG-+k{QLuQXp!b{ncwQo|MznR!+nkLebHAa!e0
z=13q{ewT@d{#dR*eKe8D=aodi^5)68%A02k70X`b;CZzi2CId^Qj<Yuw%0Z1AVgXG
zFO=>%|4uI<OO(VX>Lp5Y&P%|x`RJ*ppf4--4x>*77PG#YPcMh?Ko@#wd|~oi?dZ8o
zW(O^U+A|mjcVds``j$rcl=e1CJc*OY*8YZudou79p2QJ-cs8F=7wMDaoR}n=GwO6D
zak};cPpbN6Ok9J90zEF<&N1b%_6Cg@20F7#yAAf0nZI9i%rNS^<e1RxJEuKQBFWOe
zq8@i<x7)U}sNzgfgC+hsZ-udoJ+8&KKq2u3O;@dhs}=W+8t8ES`>Iv9F$Oknwx}nm
zR@hnYx&xK6?o81dpOU()4Gm9Z6kpK}#c}|HB-?|Du^Edq+dlBGnE1O*{Bje2JMqxl
zNz}C%3u*y!OI)v!_is@W-)P@OyD{6=qi7b2l*C6`kq!lI+pg{Ywo(nEXp&y!dW|+K
z?dUgLrv(LLgw6pSssmIkpx1TiN<d#@&w=Hp+GE<!baX`5>`>g%wcf(wRm&R_N3Z~Q
zfs4f-?^<8L;txyAFrYnXOuPg_ZMIF1p&76n)$O`oqY>6Ty6LSb*rFF`Gj-_4q*@Bq
zI2kBl>cjf_n?6e#piNgB!KH1RR%70FpQwzFv~62$={^yN7a>!C)^9%HvOTfe_2#jH
zbPLVxfw3lg5Fq2WP1m9<y}~TOTuWWIdQ$fn@O1#^pQeekubCgAw5eay%>P<R7GphN
z3N)gFww>3x6YnaiMHZ~=Gevh>;>SISqkUs+6S~k`D!)`o9H6Nczto-h5EK0RS@E<d
z@kQTwYEReKvuvAw0>PcLaPuTG+CyJqD@^RguDG|5X~(g++^PF4i6(}5zQE#6E@7C^
zN@D++q8lyhXn>vy3udrD;wP#0aRc+yw)1-yR4R*Y*KdsXDXDn{edBohyT00}_G2&@
zo<LgWES6PwZviUyB>cq#>(6zk%exD$PX}@xhV=`7DT%M#iL>M}CGmA_FP1&lTWb2<
zFbVI~H`Qj8RP|Ck@|47e3Oirvno3peYpmdBYszpB2YR5lo=bkD-3<}=8T+hl(>hEZ
zB?)nONXbCjlj<z<B+h74xVQFkAq7I7gyv5CPMLg2NtG9><N5wlfv1YtU*IV1tN+3%
z&O91F=1I1Z!Bg`s=RAo|H4FAmSNHW5MR;(nxzm*_s!&oRyU>^&l{ApPq6ZYqe)Il3
zU|RcI*xi9m9^I7HX(_^Dx!5|YKcQ9>r)|03<nw(%_h!-!<m%1=*7ufSP8;gFlH}vL
z@*_$9@xkRkI|KQ)T>0MvOMB5QJh#r^5TljD0CoioAibw*-=f@;swkv~-xbteKD}jk
zY4`pSNx-|G!oq8$axYov-hcs)PXu;~umHz)*JCvG$2v{0bSa_9#T9l;g3S;UV^;ft
z)=Wk*TBYt(3r1{1MU|3htSH0&>`8_z%9?7=yiU7|ClRhF?z0)X+e0g9<`?QXck=#X
zcQVeje}<{ez441($@#^b-?lYr?o_kI-My#GJ#%;b;N}zY(O4Y-_LY&|RhSEXKXP@?
zEpjJsDz^P4eFk$ShvR{;9u35t_yK<$pkD`ZVDTi;GEb`VJmpi>FN0|7QJ<2$gLmrX
zflk4p@1R&o9LBLo3!EmQIj1Ut(1A8_7*DOk?gVD>Wjmn64>~xie4u$?ZrSbRf>Nrj
zxUbI8TlhmsPJa<r+%rF<r?#!-Tk47SJlUsi&HPYpL6_V~8>;J~>Qa}rpdF$D?F0l}
z$(FO-T0!?&%bHho!KD!NBtDix`ytf#Bo1P8f%C;74`RPWTd7&4+N+RBkHm_iXD2pp
zJla#!_aLJ$|M-`**5($fwXS_Fr8IWw&AM<5GJOZ3HH$L)W#$cJCK9sEom@(X&IhEe
z+FtEySnJyciS;D$1a~2x;sb91us@WBJTT;e|92j+;M-`;vdUm^*%apMh{RO8FW4Hr
zhQ%YX(5eW&GzY>Rttx$24n<ZG5n1|F4vt8rBgW$R@Xj`FWK-;H{rc>e^_q>dNht19
z?Uk|YM{4_eRv7~@yM)mvX)iB?A@KBVy84F77@I3|vnEbtC6n--Iuu~hmGX0YW2h~1
zwQ8r2?si{CH0t-M;dNKi;Pifx$sEA771t45{kS|h2$kd7is$1qxQ^p`4@c3DaJ`7@
zGh7-j(w`IxMB4lTyVqM8E185`DB>4PDB=sp+x+(H@f{uoj^GU?_;o`K`OpOEI6MEk
zUKv}y!afK6WcZ8^Z`%2n_*MQ0j8<LfkZZWs6ua(?YdD=en_5Hd5w%XNj5&N{XJW|!
z=5S1nMSWBKtug&~3P*5a$)8-~dZ8NitFueQ$i&c%to5p^P&7q$5krkMd3H%CV6P(a
z$@XiAKm$Vy$#^t^5rVCakh5G~I6DlA*Fd)Y1imnUo;`^%0xdp;aly;le$Xx8wf;=z
zENIndnM?(qZCgO^0^JU}0rV{BbD+V`^)D3~#`sI{Wq4*f>7@@zeq*=XyNFrVmRc^q
zWO#9pWq2v!6jM@<x+apKNQ28WR)KPoKYJXuQ3tb@He1VXw2fF(+{NaOn|;l+3T}q<
z8*!DQPy9@dJf$jJci_@cpA(cdSW8m{4c4-U3td+GgGDiGS(CN2!Ad&yxTyc<AiE5d
zwPa-*N!Dep>K@i;t+~%y1znf547Q-@+O_vz{<RF^yK&j!J8Co4^Kd~cw@dsHTy-d$
z1FDxnzq`<FwSV7Q)~L6DULlInM-SvWNe+qHR1WL~VEi{oZdb9EJy_UcwRaa4Y$=iY
zt`YOI`T2N1W(uxl&^?av;=dz8_fhKmBZbXYd#b3xTJ`WSm$l}>i(J<F?%^#~XTdim
z)_Nf5X@k`cNzua*jQl}kegI?6e`_7ErDSb2XKgL8b{1Y<0Ap~M$yn2f!eJKc+D2=a
z<qqpwm$j4k5!)bZ!x;CX9>W;r_`RUL#N>JE<xm>(z>o)qJTT;eArB0BV8{diHy)62
zDl#qwM<Jfh2`c%EMMm;tP5f0Ro?>e#(Yc%_{vDYizFSXY=<tg~ai^4I{0zmPQlfJ!
zrExl8GLA;5Wy?>W&vcN;7W#1o3E#|kS|$wO!xvBdmto}an*~pwiT25p7M*h`8DnLL
z7iJlA5;qW6yI<(b^F95LOi9LE>=%Y5-Y+Va{W_$J)8~DjWc~ORh4%*_7sban&Oa;k
z@d=poqI!noGv{v<<@oH*`E0v|{XaL6apmTEXNY;A|8m3Ft%45-dXJzF3i_m=&kMRu
z(7l4bC+Mewo)PpS5k&JHL9Y^YhM>)Y-YTeU=XR%_YneB1mc6RQA5l9x?6tLyX^t9u
zXWe9xmC_ed8kZvW8Gq+Dmkx&O^I;T|@#<2C)`11_p|U*^uR;btlQFq|Bu>9?6fjIW
z(SM28A!EU;Hjf9ruaW&;r<ByGo8y?pCfp0$7=NToGqyGl{t(Bl%pBMGSRVQ3guFSf
z_UFJ$2WjU>yjKktKl=}mA1n^{tvvPq7WhP5=F|^hu>KZefGIxL94}1ow}Z)73VCz9
ztwZ4EINv#W>`;6$)oYHcT`F*MT<s|MXR!F?U>^JUF`3IR6v1Rp;gC&v<e$ld|1uB$
zRv!G_JUGQw4(89Zzz2(i9)bSSJlQH6F4|wl@eAXZ$8-M(Ap@z&gEt5}y(as+^0ae7
z9y=@Z;2VJ34egNGr}E%G%Y(m}$Nsw<w=#2lH@<v^A`Ty-b@A6D-X_J{yvQ}b$*VLj
z0@N1k@CI8WZ4^t550)Y3#SNjujkhgu&3Dg(1mdl|O$!<+5WB^5Q-jOny{WnRmZrtt
z#jXZV6Hr6!v@;v`i?CiEV4X!M=ojBFDLxql|8q+Ic*ruOeZgD>1Zf+>yK`(o8lQx7
zARh32K?rzOWLjO`sAxUHJ1Z%AF?gUf58=)cHN;LEV#>23)AaE3EKk-&ba*aC;p4do
zLd|mkJ(xTP(j(DxAdI&ugqvL3-kBrB1JZL4W1P1LeK(aGg59$v6x#hqWA_IM^B**n
zUyqy5+9faLMw>H7Y+bwBx)M~4>NF^G_;tY_?PQKfhw68%io_kAQN-Uz)pY`LHMpzQ
z)>Vv`1zTf5=4e|Nfjyn#R|{Tpk3Sj<bwqL)FUq3+a4RW@TxVEi4!(jM$U0VafK~l#
zap#N65$&J>U=DxK8;G{H`@O+77?GT=>TQiiThTnyka^V5+8*+u`VN&WqjB60;_sQm
z*U{dNQ;ghC{<l;=mkgYP<=-1hD$nP#9&C>}X%aX(6JtB#Dc|1{isI}!U-C1MG3w|0
zyFw{nBr}3Gg5sz84q3l^Z;<qNLQcL%$n&~1vj7=7+Dm=;ULk3}IC#^02lZX*%k%xM
zz(_>u%l8yX<$DQ4cryF%PN4J-Aob<BU(&@wPqtsmNxB;4^iCmp`CcLELZNSNzku1j
z$dFH^zI?BdRKC~9`px~{B=j4ELHVAPrJ}>6Pw!G@{YQY2h<vZho_EE$SH6EigeUX(
zCx9CD?Ltpdr^(@>I9tsVCjGm_`-7yiy?X5f?U(qEP5Sa2Dd}_KJx=P&`X&EUlfHZp
zkW{`;N_lhtUljUs{Fq%x3L3~3=(udRkYcYOLoSkH^1VgUuoM*3T>l#;{X-LVK}o~X
zu+TTx|2A+dF0stA-wov7;hN<oFDae(Z3cb$U12MNaw$nUog3gK{s$D$+>`ao_bT~!
z)ppT-IX|VI9LJ}iOa7Dk^6z~PO$CTlrIYMk>Pz~cC^70Yrx2~t=~lr?BK0Kw0tH5W
zd0yTs^kqBE`jY<&8L}nY-|N&%dh_Vp_2TUPJaSaO5YOULe?k_~GbBsNNKI3Ommd)Z
x_lpTf&mme$vfpz5rS&1(&K1S&h3R_cW0P@Nuau?bKA8SP^}57xlY)t5{|$PHoZA2Z

literal 0
HcmV?d00001

diff --git a/perl/main.pl b/perl/main.pl
index 548227c..606a402 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -14,12 +14,16 @@ my $template = Template->new(
 
 sub base_page
 {
-    my ($ssn, $data) = @_;
+    my ($ssn, $data, $main) = @_;
     my $result;
 
     my %vars = (
         prefix => '',
+        ssn => $ssn,
+        title => $L10N{'EN_US'}->{'APP_NAME'},
         lang => sub { $L10N{'EN_US'}->{shift(@_)} },
+        main => $main,
+        sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
     );
 
     $template->process(\$data, \%vars, \$result) ||
diff --git a/src/base_page.c b/src/base_page.c
index cfc8518..b77f200 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -47,34 +47,10 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     HV* session_hv = perlify_session(ssn);
     XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
     XPUSHs(sv_2mortal(newSVpv(data_main_tt, 0)));
+    XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
     
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    enum l10n_locale locale = l10n_normalize(ssn->config.lang);
-    char* theme_str = NULL;
-    const char* login_string = "<a href=\"login\" id=\"login-header\">Login / Register</a>";
-    const char* sidebar_embed = "<iframe class=\"sidebar-frame\" loading=\"lazy\" src=\"/notifications_compact\"></iframe>";
-    char* background_url_css = NULL;
-    // Sidebar
-    char* sidebar_str,
-        * main_sidebar_str = NULL,
-        * account_sidebar_str = NULL,
-        * instance_str = NULL;
-    // Mastodont, used for notifications sidebar
-    struct mstdnt_storage storage = { 0 };
-    struct mstdnt_notification* notifs = NULL;
-    size_t notifs_len = 0;
-#define SIDEBAR_CSS_LEN 128
-    char sidebar_css[SIDEBAR_CSS_LEN];
-
-    /* if (keyint(ssn->cookies.logged_in)) */
-    /*     login_string = ""; */
-
-    /* if (ssn->config.background_url) */
-    /* { */
-    /*     easprintf(&background_url_css, BODY_STYLE, ssn->config.background_url); */
-    /* } */
-
     /* // If user is logged in */
     /* if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token)) */
     /* { */
@@ -113,89 +89,6 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     /*         mastodont_storage_cleanup(&storage); */
     /*     } */
     /* } */
-    /* else { */
-    /*     // Construct small login page */
-    /*     struct quick_login_template tdata = { */
-    /*         .prefix = config_url_prefix, */
-    /*         .username = L10N[locale][L10N_USERNAME], */
-    /*         .password = L10N[locale][L10N_PASSWORD], */
-    /*         .login = L10N[locale][L10N_LOGIN_BTN], */
-    /*     }; */
-    /*     main_sidebar_str = tmpl_gen_quick_login(&tdata, NULL); */
-    /* } */
-
-    // Combine into sidebar
-    easprintf(&sidebar_str, "%s%s",
-              account_sidebar_str ? account_sidebar_str : "",
-              main_sidebar_str ? main_sidebar_str : "");
-
-    // Create instance panel
-    if (g_cache.panel_html.response)
-        easprintf(&instance_str, "<div class=\"static-html\" id=\"instance-panel\">%s</div>",
-                  (g_cache.panel_html.response ?
-                   g_cache.panel_html.response : ""));
-
-    if (ssn->config.theme && !(strcmp(ssn->config.theme, "treebird") == 0 &&
-          ssn->config.themeclr == 0))
-    {
-        easprintf(&theme_str, "<link rel=\"stylesheet\" type=\"text/css\" href=\"/%s%s.css\">",
-                  ssn->config.theme,
-                  ssn->config.themeclr ? "-dark" : "");
-    }
-
-    if (ssn->config.sidebar_opacity)
-    {
-        float sidebar_opacity = (float)ssn->config.sidebar_opacity / 255.0f;
-        snprintf(sidebar_css, SIDEBAR_CSS_LEN, ":root { --sidebar-opacity: %.2f; }",
-                 sidebar_opacity);
-    }
-
-    struct index_template index_tmpl = {
-        .title = L10N[locale][L10N_APP_NAME],
-        .sidebar_css = sidebar_css,
-        .theme_str = theme_str,
-        .prefix = config_url_prefix,
-        .background_url = background_url_css,
-        .name = L10N[locale][L10N_APP_NAME],
-        .sidebar_cnt = login_string,
-        .placeholder = L10N[locale][L10N_SEARCH_PLACEHOLDER],
-        .search_btn = L10N[locale][L10N_SEARCH_BUTTON],
-        .active_home = CAT_TEXT(page->category, BASE_CAT_HOME),
-        .home = L10N[locale][L10N_HOME],
-        .active_local = CAT_TEXT(page->category, BASE_CAT_LOCAL),
-        .local = L10N[locale][L10N_LOCAL],
-        .active_federated = CAT_TEXT(page->category, BASE_CAT_FEDERATED),
-        .federated = L10N[locale][L10N_FEDERATED],
-        .active_notifications = CAT_TEXT(page->category, BASE_CAT_NOTIFICATIONS),
-        .notifications = L10N[locale][L10N_NOTIFICATIONS],
-        .active_lists = CAT_TEXT(page->category, BASE_CAT_LISTS),
-        .lists = L10N[locale][L10N_LISTS],
-        .active_favourites = CAT_TEXT(page->category, BASE_CAT_FAVOURITES),
-        .favourites = L10N[locale][L10N_FAVOURITES],
-        .active_bookmarks = CAT_TEXT(page->category, BASE_CAT_BOOKMARKS),
-        .bookmarks = L10N[locale][L10N_BOOKMARKS],
-        .active_direct = CAT_TEXT(page->category, BASE_CAT_DIRECT),
-        .direct = L10N[locale][L10N_DIRECT],
-        .active_chats = CAT_TEXT(page->category, BASE_CAT_CHATS),
-        .chats = "Chats",
-        .active_config = CAT_TEXT(page->category, BASE_CAT_CONFIG),
-        .config = L10N[locale][L10N_CONFIG],
-        .sidebar_leftbar = page->sidebar_left,
-        .instance_panel = ssn->config.instance_panel ? instance_str : "",
-        .main = page->content,
-        .sidebar_rightbar = sidebar_str,
-        .about_link_str = "About",
-        .license_link_str = "License",
-        .source_link_str = "Source code",
-    };
-    
-//    char* data = tmpl_gen_index(&index_tmpl, &len);
-    
-    /* if (!data) */
-    /* { */
-    /*     perror("malloc"); */
-    /*     goto cleanup; */
-    /* } */
 
     // Run function
     PUTBACK;
@@ -205,17 +98,8 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     char* data = POPp;
     
     send_result(req, NULL, "text/html", data, 0);
-
-    // Cleanup
-/* cleanup_all: */
-//    free(data);
 cleanup:
-    /* free(sidebar_str); */
-    /* if (main_sidebar_str != sidebar_embed) free(main_sidebar_str); */
-    /* free(account_sidebar_str); */
-    /* free(background_url_css); */
-    /* free(instance_str); */
-    /* free(theme_str); */
+
 
     PUTBACK;
     FREETMPS;
diff --git a/templates/main.ctt b/templates/main.ctt
index b60dd43..bfa7429 100644
--- a/templates/main.ctt
+++ b/templates/main.ctt
@@ -1,5 +1,5 @@
 #ifndef __data_main_tt
 #define __data_main_tt
-static size_t data_main_tt_size = 5000;
-static const char data_main_tt[] = {0X3C,0X21,0X44,0X4F,0X43,0X54,0X59,0X50,0X45,0X20,0X68,0X74,0X6D,0X6C,0X3E,0XA,0X3C,0X68,0X74,0X6D,0X6C,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X5F,0X75,0X72,0X6C,0X20,0X7D,0X7D,0X3E,0XA,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X63,0X68,0X61,0X72,0X73,0X65,0X74,0X3D,0X22,0X75,0X74,0X66,0X2D,0X38,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X74,0X69,0X74,0X6C,0X65,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X69,0X74,0X6C,0X65,0X20,0X7D,0X7D,0X3C,0X2F,0X74,0X69,0X74,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X69,0X63,0X6F,0X6E,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X69,0X6D,0X61,0X67,0X65,0X2F,0X70,0X6E,0X67,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X66,0X61,0X76,0X69,0X63,0X6F,0X6E,0X2E,0X70,0X6E,0X67,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X73,0X74,0X79,0X6C,0X65,0X73,0X68,0X65,0X65,0X74,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X2F,0X63,0X73,0X73,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X2E,0X63,0X73,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X68,0X65,0X6D,0X65,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X76,0X69,0X65,0X77,0X70,0X6F,0X72,0X74,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X77,0X69,0X64,0X74,0X68,0X3D,0X64,0X65,0X76,0X69,0X63,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X2C,0X20,0X69,0X6E,0X69,0X74,0X69,0X61,0X6C,0X2D,0X73,0X63,0X61,0X6C,0X65,0X3D,0X31,0X2E,0X30,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X64,0X65,0X73,0X63,0X72,0X69,0X70,0X74,0X69,0X6F,0X6E,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X69,0X74,0X6C,0X65,0X20,0X7D,0X7D,0X20,0X69,0X73,0X20,0X61,0X20,0X64,0X65,0X63,0X65,0X6E,0X74,0X72,0X61,0X6C,0X69,0X7A,0X65,0X64,0X20,0X73,0X6F,0X63,0X69,0X61,0X6C,0X20,0X6D,0X65,0X64,0X69,0X61,0X20,0X70,0X6C,0X61,0X74,0X66,0X6F,0X72,0X6D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X63,0X73,0X73,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X3C,0X62,0X6F,0X64,0X79,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X2D,0X70,0X61,0X67,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X65,0X72,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X32,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X32,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X36,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X36,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X38,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X38,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X22,0X3E,0X3C,0X69,0X6D,0X67,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X5F,0X6C,0X6F,0X67,0X6F,0X2E,0X70,0X6E,0X67,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X34,0X32,0X22,0X3E,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X69,0X6E,0X66,0X6F,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X6E,0X61,0X6D,0X65,0X20,0X7D,0X7D,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X70,0X61,0X74,0X68,0X20,0X64,0X3D,0X22,0X4D,0X32,0X32,0X20,0X31,0X37,0X48,0X32,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X2D,0X33,0X56,0X39,0X61,0X37,0X20,0X37,0X20,0X30,0X20,0X30,0X20,0X31,0X20,0X31,0X34,0X20,0X30,0X76,0X35,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X20,0X33,0X7A,0X6D,0X2D,0X38,0X2E,0X32,0X37,0X20,0X34,0X61,0X32,0X20,0X32,0X20,0X30,0X20,0X30,0X20,0X31,0X2D,0X33,0X2E,0X34,0X36,0X20,0X30,0X22,0X3E,0X3C,0X2F,0X70,0X61,0X74,0X68,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X2D,0X62,0X74,0X6E,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X63,0X69,0X72,0X63,0X6C,0X65,0X20,0X63,0X78,0X3D,0X22,0X31,0X31,0X22,0X20,0X63,0X79,0X3D,0X22,0X31,0X31,0X22,0X20,0X72,0X3D,0X22,0X38,0X22,0X3E,0X3C,0X2F,0X63,0X69,0X72,0X63,0X6C,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X78,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X2D,0X63,0X6F,0X6E,0X74,0X61,0X69,0X6E,0X65,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X63,0X6E,0X74,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X66,0X6F,0X72,0X6D,0X20,0X61,0X63,0X74,0X69,0X6F,0X6E,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X73,0X65,0X61,0X72,0X63,0X68,0X22,0X20,0X6D,0X65,0X74,0X68,0X6F,0X64,0X3D,0X22,0X67,0X65,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X6C,0X65,0X66,0X74,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X69,0X6E,0X70,0X75,0X74,0X62,0X6F,0X78,0X22,0X20,0X70,0X6C,0X61,0X63,0X65,0X68,0X6F,0X6C,0X64,0X65,0X72,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X50,0X4C,0X41,0X43,0X45,0X48,0X4F,0X4C,0X44,0X45,0X52,0X27,0X29,0X20,0X25,0X5D,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X22,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X71,0X22,0X3E,0X3C,0X21,0X2D,0X2D,0X20,0X69,0X20,0X68,0X61,0X74,0X65,0X20,0X48,0X54,0X4D,0X4C,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X2D,0X2D,0X3E,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X73,0X75,0X62,0X6D,0X69,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X74,0X6E,0X20,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X20,0X76,0X61,0X6C,0X75,0X65,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X42,0X55,0X54,0X54,0X4F,0X4E,0X27,0X29,0X20,0X25,0X5D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X66,0X6F,0X72,0X6D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X65,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X61,0X62,0X6C,0X65,0X20,0X69,0X64,0X3D,0X22,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X75,0X69,0X2D,0X74,0X61,0X62,0X6C,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X61,0X76,0X69,0X67,0X61,0X74,0X69,0X6F,0X6E,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X68,0X6F,0X6D,0X65,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X48,0X4F,0X4D,0X45,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X6F,0X63,0X61,0X6C,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X6F,0X63,0X61,0X6C,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X4F,0X43,0X41,0X4C,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X45,0X44,0X45,0X52,0X41,0X54,0X45,0X44,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4E,0X4F,0X54,0X49,0X46,0X49,0X43,0X41,0X54,0X49,0X4F,0X4E,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X69,0X73,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X69,0X73,0X74,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X49,0X53,0X54,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X41,0X56,0X4F,0X55,0X52,0X49,0X54,0X45,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X42,0X4F,0X4F,0X4B,0X4D,0X41,0X52,0X4B,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X64,0X69,0X72,0X65,0X63,0X74,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X64,0X69,0X72,0X65,0X63,0X74,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X44,0X49,0X52,0X45,0X43,0X54,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X68,0X61,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X68,0X61,0X74,0X73,0X22,0X3E,0X43,0X68,0X61,0X74,0X73,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X43,0X4F,0X4E,0X46,0X49,0X47,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X69,0X6E,0X73,0X74,0X61,0X6E,0X63,0X65,0X5F,0X70,0X61,0X6E,0X65,0X6C,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6D,0X69,0X6E,0X69,0X2D,0X6C,0X69,0X6E,0X6B,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X62,0X6F,0X75,0X74,0X5F,0X6C,0X69,0X6E,0X6B,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X2F,0X6C,0X69,0X63,0X65,0X6E,0X73,0X65,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X6C,0X69,0X63,0X65,0X6E,0X73,0X65,0X5F,0X6C,0X69,0X6E,0X6B,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X68,0X74,0X74,0X70,0X73,0X3A,0X2F,0X2F,0X66,0X6F,0X73,0X73,0X69,0X6C,0X2E,0X6E,0X65,0X6B,0X6F,0X62,0X69,0X74,0X2E,0X6E,0X65,0X74,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X22,0X3E,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X6F,0X75,0X72,0X63,0X65,0X5F,0X6C,0X69,0X6E,0X6B,0X5F,0X73,0X74,0X72,0X20,0X7D,0X7D,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X44,0X69,0X73,0X70,0X6C,0X61,0X79,0X20,0X66,0X6F,0X72,0X20,0X70,0X6F,0X73,0X74,0X73,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X6D,0X61,0X69,0X6E,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X61,0X6E,0X64,0X20,0X73,0X75,0X63,0X68,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X61,0X62,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X6F,0X75,0X72,0X63,0X65,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X6D,0X61,0X69,0X6E,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X65,0X6D,0X6F,0X6A,0X69,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X3C,0X2F,0X62,0X6F,0X64,0X79,0X3E,0XA,0X3C,0X2F,0X68,0X74,0X6D,0X6C,0X3E,0XA,0};
+static size_t data_main_tt_size = 5406;
+static const char data_main_tt[] = {0X3C,0X21,0X44,0X4F,0X43,0X54,0X59,0X50,0X45,0X20,0X68,0X74,0X6D,0X6C,0X3E,0XA,0X3C,0X68,0X74,0X6D,0X6C,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X5F,0X75,0X72,0X6C,0X20,0X25,0X5D,0X73,0X74,0X79,0X6C,0X65,0X3D,0X22,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X3A,0X75,0X72,0X6C,0X28,0X27,0X5B,0X25,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X5F,0X75,0X72,0X6C,0X20,0X25,0X5D,0X27,0X29,0X22,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0X3E,0XA,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X63,0X68,0X61,0X72,0X73,0X65,0X74,0X3D,0X22,0X75,0X74,0X66,0X2D,0X38,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X74,0X69,0X74,0X6C,0X65,0X3E,0X24,0X74,0X69,0X74,0X6C,0X65,0X3C,0X2F,0X74,0X69,0X74,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X69,0X63,0X6F,0X6E,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X69,0X6D,0X61,0X67,0X65,0X2F,0X70,0X6E,0X67,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X66,0X61,0X76,0X69,0X63,0X6F,0X6E,0X2E,0X70,0X6E,0X67,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X73,0X74,0X79,0X6C,0X65,0X73,0X68,0X65,0X65,0X74,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X2F,0X63,0X73,0X73,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X2E,0X63,0X73,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X21,0X28,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X20,0X3D,0X3D,0X20,0X22,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X22,0X20,0X26,0X26,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X63,0X6C,0X72,0X20,0X3D,0X3D,0X20,0X30,0X29,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X72,0X65,0X6C,0X3D,0X22,0X73,0X74,0X79,0X6C,0X65,0X73,0X68,0X65,0X65,0X74,0X22,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X2F,0X63,0X73,0X73,0X22,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X5B,0X25,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X20,0X25,0X5D,0X5B,0X25,0X20,0X49,0X46,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X63,0X6C,0X72,0X20,0X25,0X5D,0X2D,0X64,0X61,0X72,0X6B,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0X2E,0X63,0X73,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X76,0X69,0X65,0X77,0X70,0X6F,0X72,0X74,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X77,0X69,0X64,0X74,0X68,0X3D,0X64,0X65,0X76,0X69,0X63,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X2C,0X20,0X69,0X6E,0X69,0X74,0X69,0X61,0X6C,0X2D,0X73,0X63,0X61,0X6C,0X65,0X3D,0X31,0X2E,0X30,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X64,0X65,0X73,0X63,0X72,0X69,0X70,0X74,0X69,0X6F,0X6E,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X69,0X74,0X6C,0X65,0X20,0X7D,0X7D,0X20,0X69,0X73,0X20,0X61,0X20,0X64,0X65,0X63,0X65,0X6E,0X74,0X72,0X61,0X6C,0X69,0X7A,0X65,0X64,0X20,0X73,0X6F,0X63,0X69,0X61,0X6C,0X20,0X6D,0X65,0X64,0X69,0X61,0X20,0X70,0X6C,0X61,0X74,0X66,0X6F,0X72,0X6D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6F,0X70,0X61,0X63,0X69,0X74,0X79,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3A,0X72,0X6F,0X6F,0X74,0X20,0X7B,0X20,0X2D,0X2D,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X2D,0X6F,0X70,0X61,0X63,0X69,0X74,0X79,0X3A,0X20,0X5B,0X25,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6F,0X70,0X61,0X63,0X69,0X74,0X79,0X20,0X25,0X5D,0X3B,0X20,0X7D,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0XA,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X3C,0X62,0X6F,0X64,0X79,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X2D,0X70,0X61,0X67,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X65,0X72,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X32,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X32,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X36,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X36,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X38,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X38,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X22,0X3E,0X3C,0X69,0X6D,0X67,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X5F,0X6C,0X6F,0X67,0X6F,0X2E,0X70,0X6E,0X67,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X34,0X32,0X22,0X3E,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X69,0X6E,0X66,0X6F,0X22,0X3E,0X24,0X74,0X69,0X74,0X6C,0X65,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X70,0X61,0X74,0X68,0X20,0X64,0X3D,0X22,0X4D,0X32,0X32,0X20,0X31,0X37,0X48,0X32,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X2D,0X33,0X56,0X39,0X61,0X37,0X20,0X37,0X20,0X30,0X20,0X30,0X20,0X31,0X20,0X31,0X34,0X20,0X30,0X76,0X35,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X20,0X33,0X7A,0X6D,0X2D,0X38,0X2E,0X32,0X37,0X20,0X34,0X61,0X32,0X20,0X32,0X20,0X30,0X20,0X30,0X20,0X31,0X2D,0X33,0X2E,0X34,0X36,0X20,0X30,0X22,0X3E,0X3C,0X2F,0X70,0X61,0X74,0X68,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X2D,0X62,0X74,0X6E,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X63,0X69,0X72,0X63,0X6C,0X65,0X20,0X63,0X78,0X3D,0X22,0X31,0X31,0X22,0X20,0X63,0X79,0X3D,0X22,0X31,0X31,0X22,0X20,0X72,0X3D,0X22,0X38,0X22,0X3E,0X3C,0X2F,0X63,0X69,0X72,0X63,0X6C,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X78,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X2D,0X63,0X6F,0X6E,0X74,0X61,0X69,0X6E,0X65,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X21,0X73,0X73,0X6E,0X2E,0X6C,0X6F,0X67,0X67,0X65,0X64,0X5F,0X69,0X6E,0X20,0X2D,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X6C,0X6F,0X67,0X69,0X6E,0X22,0X20,0X69,0X64,0X3D,0X22,0X6C,0X6F,0X67,0X69,0X6E,0X2D,0X68,0X65,0X61,0X64,0X65,0X72,0X22,0X3E,0X4C,0X6F,0X67,0X69,0X6E,0X20,0X2F,0X20,0X52,0X65,0X67,0X69,0X73,0X74,0X65,0X72,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X5B,0X25,0X2D,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X66,0X6F,0X72,0X6D,0X20,0X61,0X63,0X74,0X69,0X6F,0X6E,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X73,0X65,0X61,0X72,0X63,0X68,0X22,0X20,0X6D,0X65,0X74,0X68,0X6F,0X64,0X3D,0X22,0X67,0X65,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X6C,0X65,0X66,0X74,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X69,0X6E,0X70,0X75,0X74,0X62,0X6F,0X78,0X22,0X20,0X70,0X6C,0X61,0X63,0X65,0X68,0X6F,0X6C,0X64,0X65,0X72,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X50,0X4C,0X41,0X43,0X45,0X48,0X4F,0X4C,0X44,0X45,0X52,0X27,0X29,0X20,0X25,0X5D,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X22,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X71,0X22,0X3E,0X3C,0X21,0X2D,0X2D,0X20,0X69,0X20,0X68,0X61,0X74,0X65,0X20,0X48,0X54,0X4D,0X4C,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X2D,0X2D,0X3E,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X73,0X75,0X62,0X6D,0X69,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X74,0X6E,0X20,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X20,0X76,0X61,0X6C,0X75,0X65,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X42,0X55,0X54,0X54,0X4F,0X4E,0X27,0X29,0X20,0X25,0X5D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X66,0X6F,0X72,0X6D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X65,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X61,0X62,0X6C,0X65,0X20,0X69,0X64,0X3D,0X22,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X75,0X69,0X2D,0X74,0X61,0X62,0X6C,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X61,0X76,0X69,0X67,0X61,0X74,0X69,0X6F,0X6E,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X68,0X6F,0X6D,0X65,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X48,0X4F,0X4D,0X45,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X6F,0X63,0X61,0X6C,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X6F,0X63,0X61,0X6C,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X4F,0X43,0X41,0X4C,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X45,0X44,0X45,0X52,0X41,0X54,0X45,0X44,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4E,0X4F,0X54,0X49,0X46,0X49,0X43,0X41,0X54,0X49,0X4F,0X4E,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X69,0X73,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X69,0X73,0X74,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X49,0X53,0X54,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X41,0X56,0X4F,0X55,0X52,0X49,0X54,0X45,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X42,0X4F,0X4F,0X4B,0X4D,0X41,0X52,0X4B,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X64,0X69,0X72,0X65,0X63,0X74,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X64,0X69,0X72,0X65,0X63,0X74,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X44,0X49,0X52,0X45,0X43,0X54,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X68,0X61,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X68,0X61,0X74,0X73,0X22,0X3E,0X43,0X68,0X61,0X74,0X73,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X43,0X4F,0X4E,0X46,0X49,0X47,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X3C,0X64,0X69,0X76,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X74,0X61,0X74,0X69,0X63,0X2D,0X68,0X74,0X6D,0X6C,0X22,0X20,0X69,0X64,0X3D,0X22,0X69,0X6E,0X73,0X74,0X61,0X6E,0X63,0X65,0X2D,0X70,0X61,0X6E,0X65,0X6C,0X22,0X3E,0X3C,0X2F,0X64,0X69,0X76,0X3E,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6D,0X69,0X6E,0X69,0X2D,0X6C,0X69,0X6E,0X6B,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X22,0X3E,0X41,0X62,0X6F,0X75,0X74,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X2F,0X6C,0X69,0X63,0X65,0X6E,0X73,0X65,0X22,0X3E,0X4C,0X69,0X63,0X65,0X6E,0X73,0X65,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X68,0X74,0X74,0X70,0X73,0X3A,0X2F,0X2F,0X66,0X6F,0X73,0X73,0X69,0X6C,0X2E,0X6E,0X65,0X6B,0X6F,0X62,0X69,0X74,0X2E,0X6E,0X65,0X74,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X22,0X3E,0X53,0X6F,0X75,0X72,0X63,0X65,0X20,0X63,0X6F,0X64,0X65,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X44,0X69,0X73,0X70,0X6C,0X61,0X79,0X20,0X66,0X6F,0X72,0X20,0X70,0X6F,0X73,0X74,0X73,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X24,0X6D,0X61,0X69,0X6E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X61,0X6E,0X64,0X20,0X73,0X75,0X63,0X68,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X61,0X62,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X6F,0X75,0X72,0X63,0X65,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X6D,0X61,0X69,0X6E,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X65,0X6D,0X6F,0X6A,0X69,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X3C,0X2F,0X62,0X6F,0X64,0X79,0X3E,0XA,0X3C,0X2F,0X68,0X74,0X6D,0X6C,0X3E,0XA,0};
 #endif
diff --git a/templates/main.tt b/templates/main.tt
index 2e26ff7..3971aaa 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -1,16 +1,23 @@
 <!DOCTYPE html>
-<html {{ %s : background_url }}>
+<html [% IF ssn.config.background_url %]style="background:url('[% ssn.config.background_url %]')"[% END %]>
   <head>
     <meta charset="utf-8">
-    <title>{{ %s : title }}</title>
+    <title>$title</title>
     <link rel="icon" type="image/png" href="/favicon.png">
     <link rel="stylesheet" type="text/css" href="/treebird.css">
-    {{ %s : theme_str }}
+    [% IF !(ssn.config.theme == "treebird" && ssn.config.themeclr == 0) %]
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="/[% ssn.config.theme %][% IF ssn.config.themeclr %]-dark[% END %].css">
+    [% END %]
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="{{ %s : title }} is a decentralized social media platform">
+    [% IF ssn.config.sidebar_opacity %]
     <style>
-      {{ %s : sidebar_css }}
+      :root { --sidebar-opacity: [% sidebar_opacity %]; }
     </style>
+    [% END %]
   </head>
   <body>
     <div id="main-page">
@@ -19,7 +26,7 @@
           <svg class="leftbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
         </label>
         <a href="{{ %s : prefix }}/"><img src="/treebird_logo.png" height="42"></a>
-        <span class="info">{{ %s : name }}</span>
+        <span class="info">$title</span>
         <label for="rightbar-show">
           <svg class="rightbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"></path></svg>
         </label>
@@ -29,7 +36,9 @@
         <input type="checkbox" class="hidden" id="searchbar-show">
         <div id="navbar-right-container">
           <div id="navbar-right">
-            {{ %s : sidebar_cnt }}
+            [% IF !ssn.logged_in -%]
+              <a href="login" id="login-header">Login / Register</a>
+            [%- END %]
             <!-- Searchbox -->
             <form action="{{ %s : prefix }}/search" method="get">
               <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><!-- i hate HTML
@@ -57,19 +66,19 @@
               <li><a class="sidebarbtn {{ %s : active_config }}" href="$prefix/config">[% lang('CONFIG') %]</a></li>
             </ul>
             {{ %s : sidebar_leftbar }}
-            {{ %s : instance_panel }}
+            <!-- <div class="static-html" id="instance-panel"></div> -->
             <div class="mini-links">
-              <a href="{{%s:prefix}}/about">{{ %s : about_link_str }}</a>
+              <a href="{{%s:prefix}}/about">About</a>
               <span class="bullet-separate">&bull;</span>
-              <a href="{{%s:prefix}}/about/license">{{ %s : license_link_str }}</a>
+              <a href="{{%s:prefix}}/about/license">License</a>
               <span class="bullet-separate">&bull;</span>
-              <a href="https://fossil.nekobit.net/treebird">{{ %s : source_link_str }}</a>
+              <a href="https://fossil.nekobit.net/treebird">Source code</a>
             </div>
           </td>
           
           <!-- Display for posts -->
           <td id="main">
-            {{ %s : main }}
+            $main
           </td>
 
           <!-- Notifications and such -->

From b8d67b3bcb555510e39d819725bc901c770be3f7 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 24 Jul 2022 01:48:01 +0000
Subject: [PATCH 007/143] Remove

FossilOrigin-Name: 5d9e507d8303aa58b1384d2419d18b7349b5f83eb8d8ea7a360ccfc566c6d179
---
 ctemplate | Bin 16664 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 ctemplate

diff --git a/ctemplate b/ctemplate
deleted file mode 100755
index e09e9f1eb84880f9be797c688a0c649e3a3795fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16664
zcmeHOe{@q-p1)~})FMeioGDl&LaRk-Xr-_PM3T}UFHS&25EL<%G$9$%v?ebC0$Qiw
z5@WPFuIq7}J?@O_s5>*_tcSz0idB9(yX%2j#|52HM$moP@}vHMMMbio?|t{CFOO!<
zp4qeW$DUqz?|Z+W`~80Jz2E!e-S_hC{Y{?c0*i&oRLE{%#MO+}5vM44YNp75I9WX#
ziTf37Ji7>d5y$j$r%q6+r$Ys~v{>MUprltunL%i|4l_w*3yG3mzSJ{PFOig$>OAQU
zqpaY~bo?c{oTRcmTc2GoXC~UnjWQ;wQICA{Lba~<!kk<x`&}jaFZIY>q_<t@Z5Miy
z+J!$QmHs53&{Z$&nQ0BmC`oG83kp3mwR0_&?Y8v&EuW}ue@cA|g<f!?ZrDu2qCQDw
zeK$jo{PI6da+nv1`tps#GT~22X}l>-4To0FsGAyYs}6@E@wL@!>t|HYsB^?R9M|!3
zYL^`s4S&mmC0H|-Uc#h)fr+OwY7>={JSB3us2(c`YeDeCK_46afTi@s^4pd2VV2?|
zrxOq_9}7AT*X6iK=L%frG(iA%L9Y~)Ts}$UD+DD{iR&uCUoB`A=<55Q-Y{+D2PgJf
zHox`r?;Y(ueD|{Qk+c4K#4nx;*3JApS-$$>dG8(cztcX=`||5k_a|Tbr=yQ=nAh~%
z<JTVlVfpLR3s2v(_lM<{S3jO6Ob$w7K*d&*Q@$z>{!AYHukzr(%7fDg3|8;o=fO|s
z!MpO{?RoGcdGLSBga2b5T+4$$k_SJP2Y)vY{?k18o;*0sZ96V=qWNw&gW#v+!4Cr;
zY+P1y+{!vfA%oP*?~MHoDj3bI+2<9_aY`<M_gt#;%XGpP0v|;y(XIouE-AePyp)Y)
zy-v<%Z%+faW94l%;X&Y3Z`XHq(I<qVonS{9?8trgDQ^ElJI#=nZPqR6cdxL2V2sX3
z!Bg5M@Vf-wsl)8=xc#y0fKvd1xH(>SLBG}rJ9c45JZ9K^0$=zY-M}R9lx7LMU-(n*
zACF3TfjhZ0ZeH)I_Kt`*rnW{^ua|k<i|2dW{89g^P)zkl7tfy;?uhsox2_EP^|HZB
zyuP)q-ashQ8V=nHK`(Y?pRn298j7%h>JNumAm;b4Mrmg>6j1|SUyvA|x~|jjUFi*X
z_*hJh`r11=2}X(FKa2WX!&KPmk48H<8ur6t)bED`ni_?XfWc&-Gp@#1U`;fn`dOf(
z(;t~p$J%up&}waC0bjTy=4aH%cr;88i#lRDeNq2))%C>J5FhZZ3T2sg%FW<9dJavC
ztcfvS(7zTHGOxd_Rc(cjZbHA?LJ@B~=5J%_>WG*6$9Vg^s=vK6+=^yFc})ymYK_MH
zUKOBM?O08{3WfbK-GyXMcOh&?+R(|Bv6uj)S+#>4)Z%eB%=2F7m^P5B%Vw{0OwZ=0
zp`S<vc%te5iZ~sX<t1JS89XWRuTW5((|I#SQ_q4^O${=%zfig~6v7E_7~3tdS08&4
z$ATjEj^N|tLKoAM^|0X8vBVd!Pry@>=P<c0onqc@6$?P({bCc^?&NAr;*vi!SI1E~
zyHd~c`w;_9Win|7Tr4?W)NjBqlfs~94Y*i}yj1Q_bncj7kS}xU44oZBS2<ue;03w}
zzgHP>arEPOjRBW?BNfyeaH?A-r&G^Sy>!W>IQ1N1(szU`bkbdy#lU3KGN+y;`I0Qk
z*j)yEgaHp4aB+0!rJV*G6D6D08gOeCWvt79+YI;?11{$t755l$@hBpgJ!Qa0b40&A
zYrw@+;{`7maPbJy6^8CZ9{4kQK<PeStR#nhGL<o9bFW&EIiPg!F5Z=GL1y~LD9ThG
z!`(K)i5&4kDo-EDAXUCkJZ(AY1DyX2@dd>9a{kxE(-xE7%K5j5r>!OZEa!I+Pg_d5
zhx5N8p0>_(7w2Chp0<T_C+B}cJZ&lIyEy+e@wAns7jph_;%N&>J30Rl@w9cMYdHS{
z;%UoB+c|$P@w8Q>OF17Up0<cI<NWuDw-Mie9zf+v;%Q4rAL0D%#M4%gKEU}!#M2g#
z?&W;c!C0UNJWsAAuEp-e=_R-5j=!&1NlmYSb!{4KD~WyX#BOanyos!m*rm-U6yp;2
zB>tcz-rq@n=0$t7MN~9%SKQ%A{D-y&Rk@QJOO?dQy^Z5DOnVL<RT8JPb110or7>N;
z!gYsh#V#c|az9$MgB~inxzwCrpu1WFZ@?+-*U+FAu)epI)SM(0EzLsPYEQTm2k%r8
zA1mF*`WG&4s_m^Mu}UasE_<|^u`dG-+k{QLuQXp!b{ncwQo|MznR!+nkLebHAa!e0
z=13q{ewT@d{#dR*eKe8D=aodi^5)68%A02k70X`b;CZzi2CId^Qj<Yuw%0Z1AVgXG
zFO=>%|4uI<OO(VX>Lp5Y&P%|x`RJ*ppf4--4x>*77PG#YPcMh?Ko@#wd|~oi?dZ8o
zW(O^U+A|mjcVds``j$rcl=e1CJc*OY*8YZudou79p2QJ-cs8F=7wMDaoR}n=GwO6D
zak};cPpbN6Ok9J90zEF<&N1b%_6Cg@20F7#yAAf0nZI9i%rNS^<e1RxJEuKQBFWOe
zq8@i<x7)U}sNzgfgC+hsZ-udoJ+8&KKq2u3O;@dhs}=W+8t8ES`>Iv9F$Oknwx}nm
zR@hnYx&xK6?o81dpOU()4Gm9Z6kpK}#c}|HB-?|Du^Edq+dlBGnE1O*{Bje2JMqxl
zNz}C%3u*y!OI)v!_is@W-)P@OyD{6=qi7b2l*C6`kq!lI+pg{Ywo(nEXp&y!dW|+K
z?dUgLrv(LLgw6pSssmIkpx1TiN<d#@&w=Hp+GE<!baX`5>`>g%wcf(wRm&R_N3Z~Q
zfs4f-?^<8L;txyAFrYnXOuPg_ZMIF1p&76n)$O`oqY>6Ty6LSb*rFF`Gj-_4q*@Bq
zI2kBl>cjf_n?6e#piNgB!KH1RR%70FpQwzFv~62$={^yN7a>!C)^9%HvOTfe_2#jH
zbPLVxfw3lg5Fq2WP1m9<y}~TOTuWWIdQ$fn@O1#^pQeekubCgAw5eay%>P<R7GphN
z3N)gFww>3x6YnaiMHZ~=Gevh>;>SISqkUs+6S~k`D!)`o9H6Nczto-h5EK0RS@E<d
z@kQTwYEReKvuvAw0>PcLaPuTG+CyJqD@^RguDG|5X~(g++^PF4i6(}5zQE#6E@7C^
zN@D++q8lyhXn>vy3udrD;wP#0aRc+yw)1-yR4R*Y*KdsXDXDn{edBohyT00}_G2&@
zo<LgWES6PwZviUyB>cq#>(6zk%exD$PX}@xhV=`7DT%M#iL>M}CGmA_FP1&lTWb2<
zFbVI~H`Qj8RP|Ck@|47e3Oirvno3peYpmdBYszpB2YR5lo=bkD-3<}=8T+hl(>hEZ
zB?)nONXbCjlj<z<B+h74xVQFkAq7I7gyv5CPMLg2NtG9><N5wlfv1YtU*IV1tN+3%
z&O91F=1I1Z!Bg`s=RAo|H4FAmSNHW5MR;(nxzm*_s!&oRyU>^&l{ApPq6ZYqe)Il3
zU|RcI*xi9m9^I7HX(_^Dx!5|YKcQ9>r)|03<nw(%_h!-!<m%1=*7ufSP8;gFlH}vL
z@*_$9@xkRkI|KQ)T>0MvOMB5QJh#r^5TljD0CoioAibw*-=f@;swkv~-xbteKD}jk
zY4`pSNx-|G!oq8$axYov-hcs)PXu;~umHz)*JCvG$2v{0bSa_9#T9l;g3S;UV^;ft
z)=Wk*TBYt(3r1{1MU|3htSH0&>`8_z%9?7=yiU7|ClRhF?z0)X+e0g9<`?QXck=#X
zcQVeje}<{ez441($@#^b-?lYr?o_kI-My#GJ#%;b;N}zY(O4Y-_LY&|RhSEXKXP@?
zEpjJsDz^P4eFk$ShvR{;9u35t_yK<$pkD`ZVDTi;GEb`VJmpi>FN0|7QJ<2$gLmrX
zflk4p@1R&o9LBLo3!EmQIj1Ut(1A8_7*DOk?gVD>Wjmn64>~xie4u$?ZrSbRf>Nrj
zxUbI8TlhmsPJa<r+%rF<r?#!-Tk47SJlUsi&HPYpL6_V~8>;J~>Qa}rpdF$D?F0l}
z$(FO-T0!?&%bHho!KD!NBtDix`ytf#Bo1P8f%C;74`RPWTd7&4+N+RBkHm_iXD2pp
zJla#!_aLJ$|M-`**5($fwXS_Fr8IWw&AM<5GJOZ3HH$L)W#$cJCK9sEom@(X&IhEe
z+FtEySnJyciS;D$1a~2x;sb91us@WBJTT;e|92j+;M-`;vdUm^*%apMh{RO8FW4Hr
zhQ%YX(5eW&GzY>Rttx$24n<ZG5n1|F4vt8rBgW$R@Xj`FWK-;H{rc>e^_q>dNht19
z?Uk|YM{4_eRv7~@yM)mvX)iB?A@KBVy84F77@I3|vnEbtC6n--Iuu~hmGX0YW2h~1
zwQ8r2?si{CH0t-M;dNKi;Pifx$sEA771t45{kS|h2$kd7is$1qxQ^p`4@c3DaJ`7@
zGh7-j(w`IxMB4lTyVqM8E185`DB>4PDB=sp+x+(H@f{uoj^GU?_;o`K`OpOEI6MEk
zUKv}y!afK6WcZ8^Z`%2n_*MQ0j8<LfkZZWs6ua(?YdD=en_5Hd5w%XNj5&N{XJW|!
z=5S1nMSWBKtug&~3P*5a$)8-~dZ8NitFueQ$i&c%to5p^P&7q$5krkMd3H%CV6P(a
z$@XiAKm$Vy$#^t^5rVCakh5G~I6DlA*Fd)Y1imnUo;`^%0xdp;aly;le$Xx8wf;=z
zENIndnM?(qZCgO^0^JU}0rV{BbD+V`^)D3~#`sI{Wq4*f>7@@zeq*=XyNFrVmRc^q
zWO#9pWq2v!6jM@<x+apKNQ28WR)KPoKYJXuQ3tb@He1VXw2fF(+{NaOn|;l+3T}q<
z8*!DQPy9@dJf$jJci_@cpA(cdSW8m{4c4-U3td+GgGDiGS(CN2!Ad&yxTyc<AiE5d
zwPa-*N!Dep>K@i;t+~%y1znf547Q-@+O_vz{<RF^yK&j!J8Co4^Kd~cw@dsHTy-d$
z1FDxnzq`<FwSV7Q)~L6DULlInM-SvWNe+qHR1WL~VEi{oZdb9EJy_UcwRaa4Y$=iY
zt`YOI`T2N1W(uxl&^?av;=dz8_fhKmBZbXYd#b3xTJ`WSm$l}>i(J<F?%^#~XTdim
z)_Nf5X@k`cNzua*jQl}kegI?6e`_7ErDSb2XKgL8b{1Y<0Ap~M$yn2f!eJKc+D2=a
z<qqpwm$j4k5!)bZ!x;CX9>W;r_`RUL#N>JE<xm>(z>o)qJTT;eArB0BV8{diHy)62
zDl#qwM<Jfh2`c%EMMm;tP5f0Ro?>e#(Yc%_{vDYizFSXY=<tg~ai^4I{0zmPQlfJ!
zrExl8GLA;5Wy?>W&vcN;7W#1o3E#|kS|$wO!xvBdmto}an*~pwiT25p7M*h`8DnLL
z7iJlA5;qW6yI<(b^F95LOi9LE>=%Y5-Y+Va{W_$J)8~DjWc~ORh4%*_7sban&Oa;k
z@d=poqI!noGv{v<<@oH*`E0v|{XaL6apmTEXNY;A|8m3Ft%45-dXJzF3i_m=&kMRu
z(7l4bC+Mewo)PpS5k&JHL9Y^YhM>)Y-YTeU=XR%_YneB1mc6RQA5l9x?6tLyX^t9u
zXWe9xmC_ed8kZvW8Gq+Dmkx&O^I;T|@#<2C)`11_p|U*^uR;btlQFq|Bu>9?6fjIW
z(SM28A!EU;Hjf9ruaW&;r<ByGo8y?pCfp0$7=NToGqyGl{t(Bl%pBMGSRVQ3guFSf
z_UFJ$2WjU>yjKktKl=}mA1n^{tvvPq7WhP5=F|^hu>KZefGIxL94}1ow}Z)73VCz9
ztwZ4EINv#W>`;6$)oYHcT`F*MT<s|MXR!F?U>^JUF`3IR6v1Rp;gC&v<e$ld|1uB$
zRv!G_JUGQw4(89Zzz2(i9)bSSJlQH6F4|wl@eAXZ$8-M(Ap@z&gEt5}y(as+^0ae7
z9y=@Z;2VJ34egNGr}E%G%Y(m}$Nsw<w=#2lH@<v^A`Ty-b@A6D-X_J{yvQ}b$*VLj
z0@N1k@CI8WZ4^t550)Y3#SNjujkhgu&3Dg(1mdl|O$!<+5WB^5Q-jOny{WnRmZrtt
z#jXZV6Hr6!v@;v`i?CiEV4X!M=ojBFDLxql|8q+Ic*ruOeZgD>1Zf+>yK`(o8lQx7
zARh32K?rzOWLjO`sAxUHJ1Z%AF?gUf58=)cHN;LEV#>23)AaE3EKk-&ba*aC;p4do
zLd|mkJ(xTP(j(DxAdI&ugqvL3-kBrB1JZL4W1P1LeK(aGg59$v6x#hqWA_IM^B**n
zUyqy5+9faLMw>H7Y+bwBx)M~4>NF^G_;tY_?PQKfhw68%io_kAQN-Uz)pY`LHMpzQ
z)>Vv`1zTf5=4e|Nfjyn#R|{Tpk3Sj<bwqL)FUq3+a4RW@TxVEi4!(jM$U0VafK~l#
zap#N65$&J>U=DxK8;G{H`@O+77?GT=>TQiiThTnyka^V5+8*+u`VN&WqjB60;_sQm
z*U{dNQ;ghC{<l;=mkgYP<=-1hD$nP#9&C>}X%aX(6JtB#Dc|1{isI}!U-C1MG3w|0
zyFw{nBr}3Gg5sz84q3l^Z;<qNLQcL%$n&~1vj7=7+Dm=;ULk3}IC#^02lZX*%k%xM
zz(_>u%l8yX<$DQ4cryF%PN4J-Aob<BU(&@wPqtsmNxB;4^iCmp`CcLELZNSNzku1j
z$dFH^zI?BdRKC~9`px~{B=j4ELHVAPrJ}>6Pw!G@{YQY2h<vZho_EE$SH6EigeUX(
zCx9CD?Ltpdr^(@>I9tsVCjGm_`-7yiy?X5f?U(qEP5Sa2Dd}_KJx=P&`X&EUlfHZp
zkW{`;N_lhtUljUs{Fq%x3L3~3=(udRkYcYOLoSkH^1VgUuoM*3T>l#;{X-LVK}o~X
zu+TTx|2A+dF0stA-wov7;hN<oFDae(Z3cb$U12MNaw$nUog3gK{s$D$+>`ao_bT~!
z)ppT-IX|VI9LJ}iOa7Dk^6z~PO$CTlrIYMk>Pz~cC^70Yrx2~t=~lr?BK0Kw0tH5W
zd0yTs^kqBE`jY<&8L}nY-|N&%dh_Vp_2TUPJaSaO5YOULe?k_~GbBsNNKI3Ommd)Z
x_lpTf&mme$vfpz5rS&1(&K1S&h3R_cW0P@Nuau?bKA8SP^}57xlY)t5{|$PHoZA2Z


From 440ee60b8d1014af4c0b71646a2e7e85a368ff5e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 24 Jul 2022 04:48:13 +0000
Subject: [PATCH 008/143] Account sidebar

FossilOrigin-Name: fdae7c14435d63dc3f2b80dafe7d37fb867211e01f4cbff31296aa9f05b43b78
---
 .fossil-settings/ignore-glob |  2 +-
 perl/main.pl                 |  6 ++--
 src/account.c                | 29 +++++++++++++++++
 src/account.h                |  3 ++
 src/base_page.c              |  4 +--
 src/global_perl.h            |  4 +++
 src/session.c                |  2 +-
 templates/main.ctt           |  5 ---
 templates/main.tt            | 61 ++++++++++++++++++++++++++++++++++--
 9 files changed, 102 insertions(+), 14 deletions(-)
 delete mode 100644 templates/main.ctt

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 3ed6ae9..bcc209f 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -11,4 +11,4 @@ config.h
 treebird
 test/tests
 scripts/*.o
-perl/*.cpl
\ No newline at end of file
+perl/*.ctt
\ No newline at end of file
diff --git a/perl/main.pl b/perl/main.pl
index 606a402..18f2187 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -14,7 +14,7 @@ my $template = Template->new(
 
 sub base_page
 {
-    my ($ssn, $data, $main) = @_;
+    my ($ssn, $data, $main, $acct) = @_;
     my $result;
 
     my %vars = (
@@ -24,7 +24,9 @@ sub base_page
         lang => sub { $L10N{'EN_US'}->{shift(@_)} },
         main => $main,
         sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
-    );
+        acct => $acct
+        );
+    
 
     $template->process(\$data, \%vars, \$result) ||
         return $template->error();
diff --git a/src/account.c b/src/account.c
index 46995ff..299df63 100644
--- a/src/account.c
+++ b/src/account.c
@@ -875,3 +875,32 @@ void content_account_favourites(PATH_ARGS)
     if (navigation_box) free(navigation_box);
     if (output) free(output);
 }
+
+HV* perlify_account(const struct mstdnt_account* acct)
+{
+    HV* acct_hv = newHV();
+
+    if (!acct) return NULL;
+
+    hvstores_str(acct_hv, "id", acct->id);
+    hvstores_str(acct_hv, "username", acct->username);
+    hvstores_str(acct_hv, "acct", acct->acct);
+    hvstores_str(acct_hv, "display_name", acct->display_name);
+    hvstores_str(acct_hv, "note", acct->note);
+    hvstores_str(acct_hv, "avatar", acct->avatar);
+    hvstores_str(acct_hv, "avatar_static", acct->avatar_static);
+    hvstores_str(acct_hv, "header", acct->header);
+    hvstores_str(acct_hv, "header_static", acct->header_static);
+    hvstores_str(acct_hv, "created_at", acct->created_at);
+    hvstores_str(acct_hv, "last_status_at", acct->last_status_at);
+    hvstores_str(acct_hv, "mute_expires_at", acct->mute_expires_at);
+    hvstores_int(acct_hv, "statuses_count", acct->statuses_count);
+    hvstores_int(acct_hv, "followers_count", acct->followers_count);
+    hvstores_int(acct_hv, "following_count", acct->following_count);
+    hvstores_int(acct_hv, "bot", acct->bot);
+    hvstores_int(acct_hv, "suspended", acct->suspended);
+    hvstores_int(acct_hv, "locked", acct->locked);
+    hvstores_int(acct_hv, "discoverable", acct->discoverable);
+    
+    return acct_hv;
+}
diff --git a/src/account.h b/src/account.h
index b74a29a..73efe1d 100644
--- a/src/account.h
+++ b/src/account.h
@@ -18,6 +18,7 @@
 
 #ifndef ACCOUNT_H
 #define ACCOUNT_H
+#include "global_perl.h"
 #include <stddef.h>
 #include <mastodont.h>
 #include "session.h"
@@ -95,4 +96,6 @@ void content_account_action(PATH_ARGS);
 void content_account_favourites(PATH_ARGS);
 void content_account_bookmarks(PATH_ARGS);
 
+HV* perlify_account(const struct mstdnt_account* acct);
+
 #endif // ACCOUNT_H
diff --git a/src/base_page.c b/src/base_page.c
index b77f200..8ed2729 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -45,9 +45,11 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     PUSHMARK(SP);
 
     HV* session_hv = perlify_session(ssn);
+    HV* acct_hv = perlify_account(&(ssn->acct));
     XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
     XPUSHs(sv_2mortal(newSVpv(data_main_tt, 0)));
     XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
+    XPUSHs(sv_2mortal(newRV_inc((SV*)acct_hv)));
     
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
@@ -99,8 +101,6 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     
     send_result(req, NULL, "text/html", data, 0);
 cleanup:
-
-
     PUTBACK;
     FREETMPS;
     LEAVE;
diff --git a/src/global_perl.h b/src/global_perl.h
index cf43d4d..fcb8fff 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -21,6 +21,10 @@
 #include <EXTERN.h>
 #include <perl.h>
 
+//    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
+#define hvstores_str(hv, key, val) hv_stores((hv), key, newSVpv((val), 0))
+#define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
+
 static PerlInterpreter* perl;
 
 #endif /* GLOBAL_PERL_H */
diff --git a/src/session.c b/src/session.c
index ef7557b..053953c 100644
--- a/src/session.c
+++ b/src/session.c
@@ -33,7 +33,7 @@ const char* const get_token(struct session* ssn)
 HV* perlify_session(struct session* ssn)
 {
     HV* ssn_hv = newHV();
-    hv_stores(ssn_hv, "logged_in", newSVuv(ssn->logged_in));
+    hvstores_int(ssn_hv, "logged_in", ssn->logged_in);
     HV* ssn_post_values = perlify_post_values(&(ssn->post));
     HV* ssn_get_values = perlify_get_values(&(ssn->query));
     HV* ssn_cookie_values = perlify_cookies(&(ssn->cookies));
diff --git a/templates/main.ctt b/templates/main.ctt
deleted file mode 100644
index bfa7429..0000000
--- a/templates/main.ctt
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef __data_main_tt
-#define __data_main_tt
-static size_t data_main_tt_size = 5406;
-static const char data_main_tt[] = {0X3C,0X21,0X44,0X4F,0X43,0X54,0X59,0X50,0X45,0X20,0X68,0X74,0X6D,0X6C,0X3E,0XA,0X3C,0X68,0X74,0X6D,0X6C,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X5F,0X75,0X72,0X6C,0X20,0X25,0X5D,0X73,0X74,0X79,0X6C,0X65,0X3D,0X22,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X3A,0X75,0X72,0X6C,0X28,0X27,0X5B,0X25,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X62,0X61,0X63,0X6B,0X67,0X72,0X6F,0X75,0X6E,0X64,0X5F,0X75,0X72,0X6C,0X20,0X25,0X5D,0X27,0X29,0X22,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0X3E,0XA,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X63,0X68,0X61,0X72,0X73,0X65,0X74,0X3D,0X22,0X75,0X74,0X66,0X2D,0X38,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X74,0X69,0X74,0X6C,0X65,0X3E,0X24,0X74,0X69,0X74,0X6C,0X65,0X3C,0X2F,0X74,0X69,0X74,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X69,0X63,0X6F,0X6E,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X69,0X6D,0X61,0X67,0X65,0X2F,0X70,0X6E,0X67,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X66,0X61,0X76,0X69,0X63,0X6F,0X6E,0X2E,0X70,0X6E,0X67,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0X20,0X72,0X65,0X6C,0X3D,0X22,0X73,0X74,0X79,0X6C,0X65,0X73,0X68,0X65,0X65,0X74,0X22,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X2F,0X63,0X73,0X73,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X2E,0X63,0X73,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X21,0X28,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X20,0X3D,0X3D,0X20,0X22,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X22,0X20,0X26,0X26,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X63,0X6C,0X72,0X20,0X3D,0X3D,0X20,0X30,0X29,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X6E,0X6B,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X72,0X65,0X6C,0X3D,0X22,0X73,0X74,0X79,0X6C,0X65,0X73,0X68,0X65,0X65,0X74,0X22,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X2F,0X63,0X73,0X73,0X22,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X2F,0X5B,0X25,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X20,0X25,0X5D,0X5B,0X25,0X20,0X49,0X46,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X74,0X68,0X65,0X6D,0X65,0X63,0X6C,0X72,0X20,0X25,0X5D,0X2D,0X64,0X61,0X72,0X6B,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0X2E,0X63,0X73,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X76,0X69,0X65,0X77,0X70,0X6F,0X72,0X74,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X77,0X69,0X64,0X74,0X68,0X3D,0X64,0X65,0X76,0X69,0X63,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X2C,0X20,0X69,0X6E,0X69,0X74,0X69,0X61,0X6C,0X2D,0X73,0X63,0X61,0X6C,0X65,0X3D,0X31,0X2E,0X30,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X6D,0X65,0X74,0X61,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X64,0X65,0X73,0X63,0X72,0X69,0X70,0X74,0X69,0X6F,0X6E,0X22,0X20,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X74,0X69,0X74,0X6C,0X65,0X20,0X7D,0X7D,0X20,0X69,0X73,0X20,0X61,0X20,0X64,0X65,0X63,0X65,0X6E,0X74,0X72,0X61,0X6C,0X69,0X7A,0X65,0X64,0X20,0X73,0X6F,0X63,0X69,0X61,0X6C,0X20,0X6D,0X65,0X64,0X69,0X61,0X20,0X70,0X6C,0X61,0X74,0X66,0X6F,0X72,0X6D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X73,0X73,0X6E,0X2E,0X63,0X6F,0X6E,0X66,0X69,0X67,0X2E,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6F,0X70,0X61,0X63,0X69,0X74,0X79,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3A,0X72,0X6F,0X6F,0X74,0X20,0X7B,0X20,0X2D,0X2D,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X2D,0X6F,0X70,0X61,0X63,0X69,0X74,0X79,0X3A,0X20,0X5B,0X25,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6F,0X70,0X61,0X63,0X69,0X74,0X79,0X20,0X25,0X5D,0X3B,0X20,0X7D,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X73,0X74,0X79,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0XA,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X3E,0XA,0X20,0X20,0X3C,0X62,0X6F,0X64,0X79,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X2D,0X70,0X61,0X67,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X68,0X65,0X61,0X64,0X65,0X72,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X32,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X32,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X36,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X36,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X33,0X22,0X20,0X79,0X31,0X3D,0X22,0X31,0X38,0X22,0X20,0X78,0X32,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X38,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X22,0X3E,0X3C,0X69,0X6D,0X67,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X5F,0X6C,0X6F,0X67,0X6F,0X2E,0X70,0X6E,0X67,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X34,0X32,0X22,0X3E,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X69,0X6E,0X66,0X6F,0X22,0X3E,0X24,0X74,0X69,0X74,0X6C,0X65,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X20,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X62,0X74,0X6E,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X70,0X61,0X74,0X68,0X20,0X64,0X3D,0X22,0X4D,0X32,0X32,0X20,0X31,0X37,0X48,0X32,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X2D,0X33,0X56,0X39,0X61,0X37,0X20,0X37,0X20,0X30,0X20,0X30,0X20,0X31,0X20,0X31,0X34,0X20,0X30,0X76,0X35,0X61,0X33,0X20,0X33,0X20,0X30,0X20,0X30,0X20,0X30,0X20,0X33,0X20,0X33,0X7A,0X6D,0X2D,0X38,0X2E,0X32,0X37,0X20,0X34,0X61,0X32,0X20,0X32,0X20,0X30,0X20,0X30,0X20,0X31,0X2D,0X33,0X2E,0X34,0X36,0X20,0X30,0X22,0X3E,0X3C,0X2F,0X70,0X61,0X74,0X68,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X61,0X62,0X65,0X6C,0X20,0X66,0X6F,0X72,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X76,0X67,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X2D,0X62,0X74,0X6E,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X78,0X6D,0X6C,0X6E,0X73,0X3D,0X22,0X68,0X74,0X74,0X70,0X3A,0X2F,0X2F,0X77,0X77,0X77,0X2E,0X77,0X33,0X2E,0X6F,0X72,0X67,0X2F,0X32,0X30,0X30,0X30,0X2F,0X73,0X76,0X67,0X22,0X20,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X30,0X22,0X20,0X68,0X65,0X69,0X67,0X68,0X74,0X3D,0X22,0X32,0X30,0X22,0X20,0X76,0X69,0X65,0X77,0X42,0X6F,0X78,0X3D,0X22,0X30,0X20,0X30,0X20,0X32,0X34,0X20,0X32,0X34,0X22,0X20,0X66,0X69,0X6C,0X6C,0X3D,0X22,0X6E,0X6F,0X6E,0X65,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X3D,0X22,0X23,0X30,0X30,0X30,0X30,0X30,0X30,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X77,0X69,0X64,0X74,0X68,0X3D,0X22,0X32,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X63,0X61,0X70,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X20,0X73,0X74,0X72,0X6F,0X6B,0X65,0X2D,0X6C,0X69,0X6E,0X65,0X6A,0X6F,0X69,0X6E,0X3D,0X22,0X72,0X6F,0X75,0X6E,0X64,0X22,0X3E,0X3C,0X63,0X69,0X72,0X63,0X6C,0X65,0X20,0X63,0X78,0X3D,0X22,0X31,0X31,0X22,0X20,0X63,0X79,0X3D,0X22,0X31,0X31,0X22,0X20,0X72,0X3D,0X22,0X38,0X22,0X3E,0X3C,0X2F,0X63,0X69,0X72,0X63,0X6C,0X65,0X3E,0X3C,0X6C,0X69,0X6E,0X65,0X20,0X78,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X79,0X31,0X3D,0X22,0X32,0X31,0X22,0X20,0X78,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X20,0X79,0X32,0X3D,0X22,0X31,0X36,0X2E,0X36,0X35,0X22,0X3E,0X3C,0X2F,0X6C,0X69,0X6E,0X65,0X3E,0X3C,0X2F,0X73,0X76,0X67,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X6C,0X61,0X62,0X65,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X2D,0X63,0X6F,0X6E,0X74,0X61,0X69,0X6E,0X65,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X69,0X64,0X3D,0X22,0X6E,0X61,0X76,0X62,0X61,0X72,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X5B,0X25,0X20,0X49,0X46,0X20,0X21,0X73,0X73,0X6E,0X2E,0X6C,0X6F,0X67,0X67,0X65,0X64,0X5F,0X69,0X6E,0X20,0X2D,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X6C,0X6F,0X67,0X69,0X6E,0X22,0X20,0X69,0X64,0X3D,0X22,0X6C,0X6F,0X67,0X69,0X6E,0X2D,0X68,0X65,0X61,0X64,0X65,0X72,0X22,0X3E,0X4C,0X6F,0X67,0X69,0X6E,0X20,0X2F,0X20,0X52,0X65,0X67,0X69,0X73,0X74,0X65,0X72,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X5B,0X25,0X2D,0X20,0X45,0X4E,0X44,0X20,0X25,0X5D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X66,0X6F,0X72,0X6D,0X20,0X61,0X63,0X74,0X69,0X6F,0X6E,0X3D,0X22,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X70,0X72,0X65,0X66,0X69,0X78,0X20,0X7D,0X7D,0X2F,0X73,0X65,0X61,0X72,0X63,0X68,0X22,0X20,0X6D,0X65,0X74,0X68,0X6F,0X64,0X3D,0X22,0X67,0X65,0X74,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X74,0X65,0X78,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X6C,0X65,0X66,0X74,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X69,0X6E,0X70,0X75,0X74,0X62,0X6F,0X78,0X22,0X20,0X70,0X6C,0X61,0X63,0X65,0X68,0X6F,0X6C,0X64,0X65,0X72,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X50,0X4C,0X41,0X43,0X45,0X48,0X4F,0X4C,0X44,0X45,0X52,0X27,0X29,0X20,0X25,0X5D,0X22,0X20,0X69,0X64,0X3D,0X22,0X73,0X65,0X61,0X72,0X63,0X68,0X62,0X6F,0X78,0X22,0X20,0X6E,0X61,0X6D,0X65,0X3D,0X22,0X71,0X22,0X3E,0X3C,0X21,0X2D,0X2D,0X20,0X69,0X20,0X68,0X61,0X74,0X65,0X20,0X48,0X54,0X4D,0X4C,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X2D,0X2D,0X3E,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X73,0X75,0X62,0X6D,0X69,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X74,0X6E,0X20,0X67,0X72,0X6F,0X75,0X70,0X20,0X67,0X72,0X6F,0X75,0X70,0X2D,0X72,0X69,0X67,0X68,0X74,0X22,0X20,0X76,0X61,0X6C,0X75,0X65,0X3D,0X22,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X53,0X45,0X41,0X52,0X43,0X48,0X5F,0X42,0X55,0X54,0X54,0X4F,0X4E,0X27,0X29,0X20,0X25,0X5D,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X66,0X6F,0X72,0X6D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X68,0X65,0X61,0X64,0X65,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X69,0X6E,0X70,0X75,0X74,0X20,0X74,0X79,0X70,0X65,0X3D,0X22,0X63,0X68,0X65,0X63,0X6B,0X62,0X6F,0X78,0X22,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X2D,0X73,0X68,0X6F,0X77,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X68,0X69,0X64,0X64,0X65,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X61,0X62,0X6C,0X65,0X20,0X69,0X64,0X3D,0X22,0X63,0X6F,0X6E,0X74,0X65,0X6E,0X74,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X75,0X69,0X2D,0X74,0X61,0X62,0X6C,0X65,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X61,0X76,0X69,0X67,0X61,0X74,0X69,0X6F,0X6E,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X68,0X6F,0X6D,0X65,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X48,0X4F,0X4D,0X45,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X6F,0X63,0X61,0X6C,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X6F,0X63,0X61,0X6C,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X4F,0X43,0X41,0X4C,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X65,0X64,0X65,0X72,0X61,0X74,0X65,0X64,0X2F,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X45,0X44,0X45,0X52,0X41,0X54,0X45,0X44,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4E,0X4F,0X54,0X49,0X46,0X49,0X43,0X41,0X54,0X49,0X4F,0X4E,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X6C,0X69,0X73,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X6C,0X69,0X73,0X74,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X4C,0X49,0X53,0X54,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X66,0X61,0X76,0X6F,0X75,0X72,0X69,0X74,0X65,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X46,0X41,0X56,0X4F,0X55,0X52,0X49,0X54,0X45,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X62,0X6F,0X6F,0X6B,0X6D,0X61,0X72,0X6B,0X73,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X42,0X4F,0X4F,0X4B,0X4D,0X41,0X52,0X4B,0X53,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X64,0X69,0X72,0X65,0X63,0X74,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X64,0X69,0X72,0X65,0X63,0X74,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X44,0X49,0X52,0X45,0X43,0X54,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X68,0X61,0X74,0X73,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X68,0X61,0X74,0X73,0X22,0X3E,0X43,0X68,0X61,0X74,0X73,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X6C,0X69,0X3E,0X3C,0X61,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X62,0X74,0X6E,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X61,0X63,0X74,0X69,0X76,0X65,0X5F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X20,0X7D,0X7D,0X22,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X24,0X70,0X72,0X65,0X66,0X69,0X78,0X2F,0X63,0X6F,0X6E,0X66,0X69,0X67,0X22,0X3E,0X5B,0X25,0X20,0X6C,0X61,0X6E,0X67,0X28,0X27,0X43,0X4F,0X4E,0X46,0X49,0X47,0X27,0X29,0X20,0X25,0X5D,0X3C,0X2F,0X61,0X3E,0X3C,0X2F,0X6C,0X69,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X75,0X6C,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X6C,0X65,0X66,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X3C,0X64,0X69,0X76,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X74,0X61,0X74,0X69,0X63,0X2D,0X68,0X74,0X6D,0X6C,0X22,0X20,0X69,0X64,0X3D,0X22,0X69,0X6E,0X73,0X74,0X61,0X6E,0X63,0X65,0X2D,0X70,0X61,0X6E,0X65,0X6C,0X22,0X3E,0X3C,0X2F,0X64,0X69,0X76,0X3E,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X64,0X69,0X76,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X6D,0X69,0X6E,0X69,0X2D,0X6C,0X69,0X6E,0X6B,0X73,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X22,0X3E,0X41,0X62,0X6F,0X75,0X74,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X7B,0X7B,0X25,0X73,0X3A,0X70,0X72,0X65,0X66,0X69,0X78,0X7D,0X7D,0X2F,0X61,0X62,0X6F,0X75,0X74,0X2F,0X6C,0X69,0X63,0X65,0X6E,0X73,0X65,0X22,0X3E,0X4C,0X69,0X63,0X65,0X6E,0X73,0X65,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X73,0X70,0X61,0X6E,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X62,0X75,0X6C,0X6C,0X65,0X74,0X2D,0X73,0X65,0X70,0X61,0X72,0X61,0X74,0X65,0X22,0X3E,0X26,0X62,0X75,0X6C,0X6C,0X3B,0X3C,0X2F,0X73,0X70,0X61,0X6E,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X61,0X20,0X68,0X72,0X65,0X66,0X3D,0X22,0X68,0X74,0X74,0X70,0X73,0X3A,0X2F,0X2F,0X66,0X6F,0X73,0X73,0X69,0X6C,0X2E,0X6E,0X65,0X6B,0X6F,0X62,0X69,0X74,0X2E,0X6E,0X65,0X74,0X2F,0X74,0X72,0X65,0X65,0X62,0X69,0X72,0X64,0X22,0X3E,0X53,0X6F,0X75,0X72,0X63,0X65,0X20,0X63,0X6F,0X64,0X65,0X3C,0X2F,0X61,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X44,0X69,0X73,0X70,0X6C,0X61,0X79,0X20,0X66,0X6F,0X72,0X20,0X70,0X6F,0X73,0X74,0X73,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X6D,0X61,0X69,0X6E,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X24,0X6D,0X61,0X69,0X6E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X4E,0X6F,0X74,0X69,0X66,0X69,0X63,0X61,0X74,0X69,0X6F,0X6E,0X73,0X20,0X61,0X6E,0X64,0X20,0X73,0X75,0X63,0X68,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X74,0X64,0X20,0X69,0X64,0X3D,0X22,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X22,0X20,0X63,0X6C,0X61,0X73,0X73,0X3D,0X22,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X22,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X7B,0X7B,0X20,0X25,0X73,0X20,0X3A,0X20,0X73,0X69,0X64,0X65,0X62,0X61,0X72,0X5F,0X72,0X69,0X67,0X68,0X74,0X62,0X61,0X72,0X20,0X7D,0X7D,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X64,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X72,0X3E,0XA,0X20,0X20,0X20,0X20,0X20,0X20,0X3C,0X2F,0X74,0X61,0X62,0X6C,0X65,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X2F,0X64,0X69,0X76,0X3E,0XA,0X20,0X20,0X20,0X20,0XA,0X20,0X20,0X20,0X20,0X3C,0X21,0X2D,0X2D,0X20,0X53,0X6F,0X75,0X72,0X63,0X65,0X20,0X2D,0X2D,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X6D,0X61,0X69,0X6E,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X20,0X20,0X3C,0X73,0X63,0X72,0X69,0X70,0X74,0X20,0X73,0X72,0X63,0X3D,0X22,0X2F,0X6A,0X73,0X2F,0X65,0X6D,0X6F,0X6A,0X69,0X2E,0X6A,0X73,0X22,0X3E,0X3C,0X2F,0X73,0X63,0X72,0X69,0X70,0X74,0X3E,0XA,0X20,0X20,0X3C,0X2F,0X62,0X6F,0X64,0X79,0X3E,0XA,0X3C,0X2F,0X68,0X74,0X6D,0X6C,0X3E,0XA,0};
-#endif
diff --git a/templates/main.tt b/templates/main.tt
index 3971aaa..13e20ad 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -83,14 +83,69 @@
 
           <!-- Notifications and such -->
           <td id="rightbar" class="sidebar">
-            {{ %s : sidebar_rightbar }}
+            [% IF ssn.cookies.logged_in %]
+            <div class="account-sidebar"
+                 [%- IF acct.header -%]
+                 style="background: linear-gradient(var(--account-overlay-gradient-top), var(--account-overlay-gradient-bottom)), url([% acct.header %]);"
+                 [%- END %]>
+              <table class="acct-info">
+                <tr>
+                  <td>
+                    <img src="[% acct.avatar %]" class="acct-pfp" loading="lazy">
+                  </td>
+                  <td class="acct-info-right">
+                    <span class="username">[% acct.username %]</span>
+                    <span class="acct">@<span class="acct-js-grep">[% acct.acct %]</span></span>
+                  </td>
+                </tr>
+              </table>
+              <table class="acct-stats">
+                <tr>
+                  <td class="header-btn btn">
+                    <a href="$prefix/@[% acct.acct %]">
+                      <span class="btn-header">[% lang('TAB_STATUSES') %]</span>
+                      <span class="btn-content">[% acct.statuses_count %]</span>
+                    </a>
+                  </td>
+                  <td class="header-btn btn">
+                    <a href="$prefix/@[% acct.acct %]/following">
+                      <span class="btn-header">[% lang('TAB_FOLLOWING') %]</span>
+                      <span class="btn-content">[% acct.following_count %]</span>
+                    </a>
+                  </td>
+                  <td class="header-btn btn">
+                    <a href="$prefix/@[% acct.acct %]/followers">
+                      <span class="btn-header">[% lang('TAB_FOLLOWERS') %]</span>
+                      <span class="btn-content">[% acct.followers_count %]</span>
+                    </a>
+                  </td>
+                </tr>
+              </table>
+            </div>
+            [% ELSE %]
+            <div class="sidebar-login">
+              <form action="$prefix/login" method="post">
+                <div class="form-group">
+                  <label for="login-username">[% lang('USERNAME') %]: </label>
+                  <input type="text" id="login-username" name="username">
+                </div>
+                <div class="form-group">
+                  <label for="login-password">[% lang('PASSWORD') %]: </label>
+                  <input type="password" id="login-password" name="password"><br>
+                </div>
+                <div class="form-group">
+                  <input class="btn" type="submit" value="[% lang('LOGIN_BTN') %]">
+                </div>
+              </form>
+            </div>
+            [% END %]
           </td>
         </tr>
       </table>
     </div>
     
     <!-- Source -->
-    <script src="/js/main.js"></script>
-    <script src="/js/emoji.js"></script>
+    <script src="$prefix/js/main.js"></script>
+    <script src="$prefix/js/emoji.js"></script>
   </body>
 </html>

From e038ff9b822e1d7094a7efe1a58fc45eaede347d Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 24 Jul 2022 17:09:10 +0000
Subject: [PATCH 009/143] Parallel Makefile

FossilOrigin-Name: 452c66e88ea68af10885312ea1ce9853ace53cb961d42c02084b0efb6d397475
---
 Makefile | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index bde286c..785e0da 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,25 @@ TARGET = treebird
 
 MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 
-all: $(MASTODONT_DIR) dep_build $(TARGET)
-apache: all apache_start
+# Not parallel friendly
+#all: $(MASTODONT_DIR) dep_build $(TARGET)
 
-$(TARGET): filec ctemplate $(TMPLS_C) $(TMPLS) $(PAGES_CMP) $(PAGES_C) $(PAGES_C_OBJ) $(OBJ) $(HEADERS) 
+all:
+	$(MAKE) dep_build
+	$(MAKE) filec
+	$(MAKE) ctemplate
+	$(MAKE) make_ctmpls
+	$(MAKE) make_pages
+	$(MAKE) make_pagesc
+	$(MAKE) make_pagescobj
+	$(MAKE) $(TARGET)
+
+make_ctmpls: $(TMPLS_C)
+make_pages: $(PAGES_CMP)
+make_pagesc: $(PAGES_C)
+make_pagescobj: $(PAGES_C_OBJ)
+
+$(TARGET): $(HEADERS) $(OBJ)
 	$(CC) -o $(TARGET) $(OBJ) $(PAGES_C_OBJ) $(LDFLAGS)
 
 filec: src/file-to-c/main.o
@@ -57,9 +72,6 @@ install: $(TARGET)
 test:
 	make -C test
 
-apache_start:
-	./scripts/fcgistarter.sh
-
 dep_build:
 	make -C $(MASTODONT_DIR)
 
@@ -70,7 +82,8 @@ clean:
 	rm -f $(OBJ) src/file-to-c/main.o
 	rm -f $(PAGES_CMP)
 	rm -f $(TMPLS_C)
-	rm -f filec
+	rm -f filec ctemplate
+	rm $(TARGET)
 	make -C $(MASTODONT_DIR) clean
 
 clean_deps:

From 2e21b6fea3d0b594e28ab36e736847a7c4deb180 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 25 Jul 2022 01:35:47 +0000
Subject: [PATCH 010/143] More perl stuff

FossilOrigin-Name: 7a4d25bfdd0b7eb8e20e91c6f01d719c8e9fb43e0d35c0d46027876b6fab8659
---
 .fossil-settings/ignore-glob |  2 +-
 perl/main.pl                 |  4 +-
 src/account.c                |  3 +-
 src/account.h                |  1 +
 src/base_page.c              | 78 ++++++++++++++++++------------------
 src/global_perl.h            |  4 +-
 src/notifications.c          | 30 ++++++++++++++
 src/notifications.h          |  4 ++
 src/session.c                | 11 +++--
 src/status.c                 | 30 ++++++++++++++
 src/status.h                 |  4 ++
 11 files changed, 121 insertions(+), 50 deletions(-)

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index bcc209f..6f37e23 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -11,4 +11,4 @@ config.h
 treebird
 test/tests
 scripts/*.o
-perl/*.ctt
\ No newline at end of file
+templates/*.ctt
\ No newline at end of file
diff --git a/perl/main.pl b/perl/main.pl
index 18f2187..0666e0d 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -14,7 +14,7 @@ my $template = Template->new(
 
 sub base_page
 {
-    my ($ssn, $data, $main, $acct) = @_;
+    my ($ssn, $data, $main) = @_;
     my $result;
 
     my %vars = (
@@ -24,7 +24,7 @@ sub base_page
         lang => sub { $L10N{'EN_US'}->{shift(@_)} },
         main => $main,
         sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
-        acct => $acct
+        acct => $ssn->{account}
         );
     
 
diff --git a/src/account.c b/src/account.c
index 299df63..93135a6 100644
--- a/src/account.c
+++ b/src/account.c
@@ -878,9 +878,8 @@ void content_account_favourites(PATH_ARGS)
 
 HV* perlify_account(const struct mstdnt_account* acct)
 {
-    HV* acct_hv = newHV();
-
     if (!acct) return NULL;
+    HV* acct_hv = newHV();
 
     hvstores_str(acct_hv, "id", acct->id);
     hvstores_str(acct_hv, "username", acct->username);
diff --git a/src/account.h b/src/account.h
index 73efe1d..1cbed18 100644
--- a/src/account.h
+++ b/src/account.h
@@ -22,6 +22,7 @@
 #include <stddef.h>
 #include <mastodont.h>
 #include "session.h"
+#include "path.h"
 #include "l10n.h"
 
 #define ACCOUNT_NOP 0
diff --git a/src/base_page.c b/src/base_page.c
index 8ed2729..6d90256 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -44,53 +44,51 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     SAVETMPS;
     PUSHMARK(SP);
 
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+
     HV* session_hv = perlify_session(ssn);
-    HV* acct_hv = perlify_account(&(ssn->acct));
     XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
     XPUSHs(sv_2mortal(newSVpv(data_main_tt, 0)));
     XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
-    XPUSHs(sv_2mortal(newRV_inc((SV*)acct_hv)));
     
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
-    /* // If user is logged in */
-    /* if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token)) */
-    /* { */
-    /*     account_sidebar_str = construct_account_sidebar(&(ssn->acct), NULL); */
-
-    /*     // Get / Show notifications on sidebar */
-    /*     if (ssn->config.notif_embed) */
-    /*     { */
-    /*         main_sidebar_str = (char*)sidebar_embed; */
-    /*     } */
-    /*     else { */
-    /*         struct mstdnt_get_notifications_args args = { */
-    /*             .exclude_types = 0, */
-    /*             .account_id = NULL, */
-    /*             .exclude_visibilities = 0, */
-    /*             .include_types = 0, */
-    /*             .with_muted = 1, */
-    /*             .max_id = NULL, */
-    /*             .min_id = NULL, */
-    /*             .since_id = NULL, */
-    /*             .offset = 0, */
-    /*             .limit = 8, */
-    /*         }; */
+    if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token))
+    {
+        // Get / Show notifications on sidebar
+        if (!ssn->config.notif_embed)
+        {
+            struct mstdnt_storage storage = { 0 };
+            struct mstdnt_notification* notifs = NULL;
+            size_t notifs_len = 0;
+            struct mstdnt_get_notifications_args args = {
+                .exclude_types = 0,
+                .account_id = NULL,
+                .exclude_visibilities = 0,
+                .include_types = 0,
+                .with_muted = 1,
+                .max_id = NULL,
+                .min_id = NULL,
+                .since_id = NULL,
+                .offset = 0,
+                .limit = 8,
+            };
         
-    /*         if (mastodont_get_notifications(api, */
-    /*                                         &m_args, */
-    /*                                         &args, */
-    /*                                         &storage, */
-    /*                                         &notifs, */
-    /*                                         &notifs_len) == 0) */
-    /*         { */
-    /*             main_sidebar_str = construct_notifications_compact(ssn, api, notifs, notifs_len, NULL); */
-    /*         } */
+            if (mastodont_get_notifications(api,
+                                            &m_args,
+                                            &args,
+                                            &storage,
+                                            &notifs,
+                                            &notifs_len) == 0)
+            {
+                AV* notifs_av = perlify_notifications(notifs, notifs_len);
+                XPUSHs(sv_2mortal(newRV_inc((SV*)notifs_av)));
+            }
 
-    /*         mstdnt_cleanup_notifications(notifs, notifs_len); */
-    /*         mastodont_storage_cleanup(&storage); */
-    /*     } */
-    /* } */
+
+            mstdnt_cleanup_notifications(notifs, notifs_len);
+            mastodont_storage_cleanup(&storage);
+        }
+    }
 
     // Run function
     PUTBACK;
diff --git a/src/global_perl.h b/src/global_perl.h
index fcb8fff..7615cf3 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -22,8 +22,10 @@
 #include <perl.h>
 
 //    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
-#define hvstores_str(hv, key, val) hv_stores((hv), key, newSVpv((val), 0))
+#define hvstores_str(hv, key, val) hv_stores((hv), key, ((val) ? newSVpv((val), 0) : &PL_sv_undef))
 #define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
+#define hvstores_ref(hv, key, val) hv_stores((hv), key,                 \
+                                             ((val) ? newRV_inc((SV* const)(val)) : &PL_sv_undef))
 
 static PerlInterpreter* perl;
 
diff --git a/src/notifications.c b/src/notifications.c
index cd4e4a8..8de544c 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -29,6 +29,7 @@
 #include "status.h"
 #include "error.h"
 #include "emoji.h"
+#include "account.h"
 #include "../config.h"
 
 // Pages
@@ -336,6 +337,35 @@ void content_notifications_compact(PATH_ARGS)
     free(theme_str);
 }
 
+// Converts it into a perl struct
+HV* perlify_notification(struct mstdnt_notification* notif)
+{
+    if (!notif) return NULL;
+    HV* notif_hv = newHV();
+
+    hvstores_str(notif_hv, "id", notif->id);
+    hvstores_str(notif_hv, "created_at", notif->created_at);
+    hvstores_ref(notif_hv, "account", perlify_account(notif->account));
+    hvstores_ref(notif_hv, "status", perlify_status(notif->status));
+    
+    return notif_hv;
+}
+
+// The same as above, but for multiple
+AV* perlify_notifications(struct mstdnt_notification* notifs, size_t len)
+{
+    if (!(notifs && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_notification(notifs + i)));
+    }
+
+    return av;
+}
+
 void api_notifications(PATH_ARGS)
 {
     send_result(req, NULL, "application/json", "{\"status\":0}", 0);
diff --git a/src/notifications.h b/src/notifications.h
index fc3b5a4..aa04a64 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -24,6 +24,7 @@
 #include "session.h"
 #include "path.h"
 #include "type_string.h"
+#include "global_perl.h"
 
 char* construct_notification(struct session* ssn,
                              mastodont_t* api,
@@ -51,4 +52,7 @@ void content_notifications_compact(PATH_ARGS);
 
 void api_notifications(PATH_ARGS);
 
+HV* perlify_notification(struct mstdnt_notification* notif);
+AV* perlify_notifications(struct mstdnt_notification* notif, size_t len);
+
 #endif // NOTIFICATION_H
diff --git a/src/session.c b/src/session.c
index 053953c..ea32235 100644
--- a/src/session.c
+++ b/src/session.c
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "account.h"
 #include "session.h"
 #include "../config.h"
 
@@ -37,12 +38,14 @@ HV* perlify_session(struct session* ssn)
     HV* ssn_post_values = perlify_post_values(&(ssn->post));
     HV* ssn_get_values = perlify_get_values(&(ssn->query));
     HV* ssn_cookie_values = perlify_cookies(&(ssn->cookies));
+    HV* acct_hv = perlify_account(&(ssn->acct));
     // Config
     HV* ssn_config = perlify_config(&(ssn->config));
-    hv_stores(ssn_hv, "config", newRV_inc((SV*)ssn_config));
-    hv_stores(ssn_hv, "cookies", newRV_inc((SV*)ssn_cookie_values));
-    hv_stores(ssn_hv, "query", newRV_inc((SV*)ssn_get_values));
-    hv_stores(ssn_hv, "post", newRV_inc((SV*)ssn_post_values));
+    hvstores_ref(ssn_hv, "config", ssn_config);
+    hvstores_ref(ssn_hv, "cookies", ssn_cookie_values);
+    hvstores_ref(ssn_hv, "query", ssn_get_values);
+    hvstores_ref(ssn_hv, "post", ssn_post_values);
+    hvstores_ref(ssn_hv, "account", acct_hv);
 
     return ssn_hv;
 }
diff --git a/src/status.c b/src/status.c
index 483e618..494d021 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1149,3 +1149,33 @@ void notice_redirect(PATH_ARGS)
     redirect(req, REDIRECT_303, url);
     free(url);
 }
+
+HV* perlify_status(const struct mstdnt_status* status)
+{
+    if (!status) return NULL;
+    
+    HV* status_hv = newHV();
+    hvstores_str(status_hv, "id", status->id);
+    hvstores_str(status_hv, "uri", status->uri);
+    hvstores_str(status_hv, "created_at", status->id);
+    hvstores_ref(status_hv, "account", perlify_account(&(status->account)));
+    hvstores_str(status_hv, "content", status->content);
+    hvstores_str(status_hv, "spoiler_text", status->spoiler_text);
+    hvstores_str(status_hv, "url", status->url);
+    hvstores_str(status_hv, "in_reply_to_id", status->in_reply_to_id);
+    hvstores_str(status_hv, "in_reply_to_account_id", status->in_reply_to_account_id);
+    hvstores_str(status_hv, "language", status->language);
+    hvstores_str(status_hv, "text", status->text);
+
+    hvstores_int(status_hv, "favourited", status->favourited);
+    hvstores_int(status_hv, "reblogged", status->reblogged);
+    hvstores_int(status_hv, "muted", status->muted);
+    hvstores_int(status_hv, "bookmarked", status->bookmarked);
+    hvstores_int(status_hv, "pinned", status->pinned);
+    hvstores_int(status_hv, "reblogs_count", status->reblogs_count);
+    hvstores_int(status_hv, "favourites_count", status->favourites_count);
+    hvstores_int(status_hv, "replies_count", status->replies_count);
+    hvstores_ref(status_hv, "status", perlify_status(status->reblog));
+
+    return status_hv;
+}
diff --git a/src/status.h b/src/status.h
index 1084105..0041ce7 100644
--- a/src/status.h
+++ b/src/status.h
@@ -23,6 +23,7 @@
 #include "l10n.h"
 #include "path.h"
 #include "session.h"
+#include "global_perl.h"
 
 // Flags
 #define STATUS_NOOP 0
@@ -134,4 +135,7 @@ void notice_redirect(PATH_ARGS);
 // API
 void api_status_interact(PATH_ARGS);
 
+// Perl
+HV* perlify_status(const struct mstdnt_status* status); 
+
 #endif // STATUS_H

From 5b9c7d75f50f1542ce95b4f062245653ac98693d Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 25 Jul 2022 05:12:54 +0000
Subject: [PATCH 011/143] Perl file hashes

FossilOrigin-Name: 99a43c7224138245ccd8270c04aefcc3b47cdf23e1eecb65abae6913e3b9105e
---
 perl/main.pl             | 28 ++++++++++++++--------------
 perl/notifications.pm    | 11 +++++++++++
 perl/template_helpers.pm | 28 ++++++++++++++++++++++++++++
 src/base_page.c          |  2 +-
 src/global_perl.c        | 34 ++++++++++++++++++++++++++++++++++
 src/global_perl.h        |  4 ++++
 src/main.c               |  4 ++++
 7 files changed, 96 insertions(+), 15 deletions(-)
 create mode 100644 perl/notifications.pm
 create mode 100644 perl/template_helpers.pm
 create mode 100644 src/global_perl.c

diff --git a/perl/main.pl b/perl/main.pl
index 0666e0d..31e886a 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -3,18 +3,20 @@ use warnings;
 # Modules
 use Template;
 use l10n qw( %L10N );
+use notifications qw( &notifs_compact );
+use template_helpers qw( &to_template );
 
-my $template = Template->new(
-    {
-        INTERPOLATE => 1,
-        POST_CHOMP => 1,
-        EVAL_PERL => 1,
-        TRIM => 1
-    });
+# my $template = Template->new(
+#     {
+#         INTERPOLATE => 1,
+#         POST_CHOMP => 1,
+#         EVAL_PERL => 1,
+#         TRIM => 1
+#     });
 
 sub base_page
 {
-    my ($ssn, $data, $main) = @_;
+    my ($ssn, $data, $main, $notifs) = @_;
     my $result;
 
     my %vars = (
@@ -24,13 +26,11 @@ sub base_page
         lang => sub { $L10N{'EN_US'}->{shift(@_)} },
         main => $main,
         sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
-        acct => $ssn->{account}
+        acct => $ssn->{account},
+        data => $data,
+        notifs => $notifs
         );
-    
 
-    $template->process(\$data, \%vars, \$result) ||
-        return $template->error();
-    
-    $result;
+    to_template(\%vars, \$data->{'main.tt'});
 }
 
diff --git a/perl/notifications.pm b/perl/notifications.pm
new file mode 100644
index 0000000..622f1fe
--- /dev/null
+++ b/perl/notifications.pm
@@ -0,0 +1,11 @@
+package Notifications;
+
+use Exporter 'import';
+
+our @EXPORT = qw( &notifs_compact );
+
+sub notifs_compact
+{
+    #    my ($template, ) = @_;
+    1;
+}
diff --git a/perl/template_helpers.pm b/perl/template_helpers.pm
new file mode 100644
index 0000000..a31a11c
--- /dev/null
+++ b/perl/template_helpers.pm
@@ -0,0 +1,28 @@
+package template_helpers;
+
+use Exporter 'import';
+
+our @EXPORT = qw( &to_template );
+
+my $template = Template->new(
+    {
+        INTERPOLATE => 1,
+        POST_CHOMP => 1,
+        EVAL_PERL => 1,
+        TRIM => 1
+    });
+
+sub to_template
+{
+    my ($vars, $data) = @_;
+    my $result;
+
+    0 unless ref $data;
+    0 unless ref $vars;
+
+    # TODO HTML error formatting
+    $template->process($data, $vars, \$result) ||
+        return $template->error();
+
+    $result;
+}
diff --git a/src/base_page.c b/src/base_page.c
index 6d90256..c85db19 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -49,7 +49,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
 
     HV* session_hv = perlify_session(ssn);
     XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
-    XPUSHs(sv_2mortal(newSVpv(data_main_tt, 0)));
+    XPUSHs(sv_2mortal(newRV_inc((SV*)template_files)));
     XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
     
     if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token))
diff --git a/src/global_perl.c b/src/global_perl.c
new file mode 100644
index 0000000..5bf5567
--- /dev/null
+++ b/src/global_perl.c
@@ -0,0 +1,34 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "global_perl.h"
+#include "../templates/main.ctt"
+
+const HV* template_files;
+
+void init_template_files()
+{
+    template_files = newHV();
+
+    hv_stores(template_files, "main.tt", newSVpv(data_main_tt, data_main_tt_size));
+}
+
+void cleanup_template_files()
+{
+    hv_undef(template_files);
+}
diff --git a/src/global_perl.h b/src/global_perl.h
index 7615cf3..ebc9634 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -28,5 +28,9 @@
                                              ((val) ? newRV_inc((SV* const)(val)) : &PL_sv_undef))
 
 static PerlInterpreter* perl;
+extern const HV* template_files;
+
+void init_template_files();
+void cleanup_template_files();
 
 #endif /* GLOBAL_PERL_H */
diff --git a/src/main.c b/src/main.c
index c9c1ebb..7d390ea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -221,6 +221,8 @@ int main(int argc, char **argv, char **env)
     PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
     perl_run(perl);
 
+    init_template_files();
+
     // Initiate mastodont library
     mastodont_t api;
     mastodont_init(&api);
@@ -240,6 +242,8 @@ int main(int argc, char **argv, char **env)
     mastodont_cleanup(&api);
     mastodont_global_curl_cleanup();
 
+    cleanup_template_files();
+
     perl_destruct(perl);
     perl_free(perl);
     PERL_SYS_TERM();

From a90878c1b8df6b1121358a4bcb9139a8ff611394 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 26 Jul 2022 22:04:44 +0000
Subject: [PATCH 012/143] Notifications perlify

FossilOrigin-Name: 0d65589909abc6c72911d68ef4c03f48c7d3f552ba5c82d681964eefbf8a2128
---
 perl/main.pl               |   5 +-
 perl/notifications.pm      |  18 ++--
 perl/status.pm             |  19 +++++
 src/base_page.c            |  82 ++++++++++---------
 src/global_perl.c          |   5 ++
 src/status.c               | 163 +++++++++++++++++++------------------
 static/status.tmpl         |  96 +++++++++++-----------
 templates/main.tt          |   6 ++
 templates/notif_compact.tt |  17 ++++
 templates/status.tt        |  68 ++++++++++++++++
 10 files changed, 303 insertions(+), 176 deletions(-)
 create mode 100644 perl/status.pm
 create mode 100644 templates/notif_compact.tt
 create mode 100644 templates/status.tt

diff --git a/perl/main.pl b/perl/main.pl
index 31e886a..541df31 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -3,7 +3,7 @@ use warnings;
 # Modules
 use Template;
 use l10n qw( %L10N );
-use notifications qw( &notifs_compact );
+use notifications qw( notification_compact );
 use template_helpers qw( &to_template );
 
 # my $template = Template->new(
@@ -28,7 +28,8 @@ sub base_page
         sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
         acct => $ssn->{account},
         data => $data,
-        notifs => $notifs
+        notifs => $notifs,
+        notification_compact => \&notification_compact,
         );
 
     to_template(\%vars, \$data->{'main.tt'});
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 622f1fe..613c946 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -1,11 +1,19 @@
-package Notifications;
+package notifications;
 
 use Exporter 'import';
 
-our @EXPORT = qw( &notifs_compact );
+our @EXPORT = qw( notification_compact );
 
-sub notifs_compact
+use template_helpers 'to_template';
+
+sub notification_compact
 {
-    #    my ($template, ) = @_;
-    1;
+    my ($ssn, $data, $notif) = @_;
+
+    my %vars = (
+        prefix => $ssn,
+        notif => $notif
+        );
+
+    to_template(\%vars, \$data->{'notif_compact.tt'});
 }
diff --git a/perl/status.pm b/perl/status.pm
new file mode 100644
index 0000000..a269e44
--- /dev/null
+++ b/perl/status.pm
@@ -0,0 +1,19 @@
+package status;
+
+use Exporter 'import';
+
+our @EXPORT = qw( status );
+
+use template_helpers 'to_template';
+
+sub status
+{
+    my ($ssn, $data, $status) = @_;
+
+    my %vars = (
+        prefix => $ssn,
+        status => $status
+        );
+
+    to_template(\%vars, \$data->{'status.tt'});
+}
diff --git a/src/base_page.c b/src/base_page.c
index c85db19..8d9ce19 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -39,57 +39,56 @@
 
 void render_base_page(struct base_page* page, FCGX_Request* req, struct session* ssn, mastodont_t* api)
 {
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    struct mstdnt_storage storage = { 0 };
+    struct mstdnt_notification* notifs = NULL;
+    size_t notifs_len = 0;
+
+    // Fetch notification (if not iFrame)
+    if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token) &&
+        !ssn->config.notif_embed)
+    {
+        struct mstdnt_get_notifications_args args = {
+            .exclude_types = 0,
+            .account_id = NULL,
+            .exclude_visibilities = 0,
+            .include_types = 0,
+            .with_muted = 1,
+            .max_id = NULL,
+            .min_id = NULL,
+            .since_id = NULL,
+            .offset = 0,
+            .limit = 8,
+        };
+        
+        mastodont_get_notifications(
+            api,
+            &m_args,
+            &args,
+            &storage,
+            &notifs,
+            &notifs_len
+            );
+    }
+
+    // Init perl stack
     dSP;
     ENTER;
     SAVETMPS;
     PUSHMARK(SP);
 
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
-
     HV* session_hv = perlify_session(ssn);
     XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
     XPUSHs(sv_2mortal(newRV_inc((SV*)template_files)));
     XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
-    
-    if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token))
+    if (notifs && notifs_len)
     {
-        // Get / Show notifications on sidebar
-        if (!ssn->config.notif_embed)
-        {
-            struct mstdnt_storage storage = { 0 };
-            struct mstdnt_notification* notifs = NULL;
-            size_t notifs_len = 0;
-            struct mstdnt_get_notifications_args args = {
-                .exclude_types = 0,
-                .account_id = NULL,
-                .exclude_visibilities = 0,
-                .include_types = 0,
-                .with_muted = 1,
-                .max_id = NULL,
-                .min_id = NULL,
-                .since_id = NULL,
-                .offset = 0,
-                .limit = 8,
-            };
-        
-            if (mastodont_get_notifications(api,
-                                            &m_args,
-                                            &args,
-                                            &storage,
-                                            &notifs,
-                                            &notifs_len) == 0)
-            {
-                AV* notifs_av = perlify_notifications(notifs, notifs_len);
-                XPUSHs(sv_2mortal(newRV_inc((SV*)notifs_av)));
-            }
-
-
-            mstdnt_cleanup_notifications(notifs, notifs_len);
-            mastodont_storage_cleanup(&storage);
-        }
+        AV* notifs_av = perlify_notifications(notifs, notifs_len);
+        XPUSHs(sv_2mortal(newRV_inc((SV*)notifs_av)));
     }
-
+    else XPUSHs(&PL_sv_undef);
+    
     // Run function
     PUTBACK;
     call_pv("base_page", G_SCALAR);
@@ -102,6 +101,9 @@ cleanup:
     PUTBACK;
     FREETMPS;
     LEAVE;
+    
+    mstdnt_cleanup_notifications(notifs, notifs_len);
+    mastodont_storage_cleanup(&storage);
 }
 
 void send_result(FCGX_Request* req, char* status, char* content_type, char* data, size_t data_len)
diff --git a/src/global_perl.c b/src/global_perl.c
index 5bf5567..ea0cf2c 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -17,7 +17,10 @@
  */
 
 #include "global_perl.h"
+
 #include "../templates/main.ctt"
+#include "../templates/notif_compact.ctt"
+#include "../templates/status.ctt"
 
 const HV* template_files;
 
@@ -26,6 +29,8 @@ void init_template_files()
     template_files = newHV();
 
     hv_stores(template_files, "main.tt", newSVpv(data_main_tt, data_main_tt_size));
+    hv_stores(template_files, "notif_compact.tt", newSVpv(data_notif_compact_tt, data_notif_compact_tt_size));
+    hv_stores(template_files, "status.tt", newSVpv(data_status_tt, data_status_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/status.c b/src/status.c
index 494d021..d877665 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1041,86 +1041,87 @@ void content_status_interactions(FCGX_Request* req,
 
 void content_status(PATH_ARGS, uint8_t flags)
 {
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
-    char* output;
-    // Status context
-    struct mstdnt_storage storage = {0}, status_storage = {0};
-    struct mstdnt_status* statuses_before = NULL,
-        *statuses_after = NULL,
-        status = { 0 };
-    size_t stat_before_len = 0, stat_after_len = 0;
-    char* before_html = NULL, *stat_html = NULL, *after_html = NULL, *stat_reply = NULL,
-        * thread_pagination = NULL;
+/*     struct mstdnt_args m_args; */
+/*     set_mstdnt_args(&m_args, ssn); */
+/*     char* output; */
+/*     // Status context */
+/*     struct mstdnt_storage storage = {0}, status_storage = {0}; */
+/*     struct mstdnt_status* statuses_before = NULL, */
+/*         *statuses_after = NULL, */
+/*         status = { 0 }; */
+/*     size_t stat_before_len = 0, stat_after_len = 0; */
+/*     char* before_html = NULL, *stat_html = NULL, *after_html = NULL, *stat_reply = NULL, */
+/*         * thread_pagination = NULL; */
 
-    int stat_after_limit = 15;
-    int stat_before_limit = 15;
-#define enough_statuses_before (stat_before_len > stat_before_limit)
-#define enough_statuses_after (stat_after_len > stat_after_limit)
+/*     int stat_after_limit = 15; */
+/*     int stat_before_limit = 15; */
+/* #define enough_statuses_before (stat_before_len > stat_before_limit) */
+/* #define enough_statuses_after (stat_after_len > stat_after_limit) */
 
-    try_post_status(ssn, api);
-    mastodont_get_status_context(api,
-                                 &m_args,
-                                 data[0],
-                                 &storage,
-                                 &statuses_before, &statuses_after,
-                                 &stat_before_len, &stat_after_len);
+/*     try_post_status(ssn, api); */
+/*     mastodont_get_status_context(api, */
+/*                                  &m_args, */
+/*                                  data[0], */
+/*                                  &storage, */
+/*                                  &statuses_before, &statuses_after, */
+/*                                  &stat_before_len, &stat_after_len); */
     
-    // Get information
-    if (mastodont_get_status(api, &m_args, data[0], &status_storage, &status))
-    {
-        stat_html = construct_error("Status not found", E_ERROR, 1, NULL);
-    }
-    else {
-        before_html = construct_statuses(ssn, api,
-                                         (enough_statuses_before ?
-                                          statuses_before + (stat_before_len - stat_before_limit) : statuses_before),
-                                         (enough_statuses_before ?
-                                          stat_before_limit : stat_before_len),
-                                         NULL, 0);
+/*     // Get information */
+/*     if (mastodont_get_status(api, &m_args, data[0], &status_storage, &status)) */
+/*     { */
+/*         stat_html = construct_error("Status not found", E_ERROR, 1, NULL); */
+/*     } */
+/*     else { */
+/*         before_html = construct_statuses(ssn, api, */
+/*                                          (enough_statuses_before ? */
+/*                                           statuses_before + (stat_before_len - stat_before_limit) : statuses_before), */
+/*                                          (enough_statuses_before ? */
+/*                                           stat_before_limit : stat_before_len), */
+/*                                          NULL, 0); */
 
-        // Current status
-        stat_html = construct_status(ssn, api, &status, NULL, NULL, NULL, flags);
-        if ((flags & STATUS_REPLY) == STATUS_REPLY)
-        {
-            stat_reply = reply_status(ssn,
-                                      data[0],
-                                      &status);
-        }
-    }
+/*         // Current status */
+/*         stat_html = construct_status(ssn, api, &status, NULL, NULL, NULL, flags); */
+/*         if ((flags & STATUS_REPLY) == STATUS_REPLY) */
+/*         { */
+/*             stat_reply = reply_status(ssn, */
+/*                                       data[0], */
+/*                                       &status); */
+/*         } */
+/*     } */
 
-    // After...
-    // For pagination, we already start at the first, so no math required here
-    after_html = construct_statuses(ssn, api, statuses_after,
-                                    (enough_statuses_after ? stat_after_limit : stat_after_len),
-                                    NULL, 0);
+/*     // After... */
+/*     // For pagination, we already start at the first, so no math required here */
+/*     after_html = construct_statuses(ssn, api, statuses_after, */
+/*                                     (enough_statuses_after ? stat_after_limit : stat_after_len), */
+/*                                     NULL, 0); */
 
-    // Thread pagination buttons
-    if (statuses_before || statuses_after)
-    {
-        struct thread_page_btn_template pagination_tmpl = {
-            .prefix = config_url_prefix,
-            .status_first = (statuses_before ? statuses_before[0].id : "deadbeef"),
-            .status_last = (statuses_after ? statuses_after[stat_after_len-1].id : "deadbeef"),
-            .status_before = (statuses_before && enough_statuses_before ? statuses_before[stat_before_len - stat_before_limit].id : "deadbeef"),
-            .status_after = (statuses_after && enough_statuses_after ?
-                             statuses_after[stat_after_limit].id : "deadbeef"),
-        };
-        thread_pagination = tmpl_gen_thread_page_btn(&pagination_tmpl, NULL);
-    }
+/*     // Thread pagination buttons */
+/*     if (statuses_before || statuses_after) */
+/*     { */
+/*         struct thread_page_btn_template pagination_tmpl = { */
+/*             .prefix = config_url_prefix, */
+/*             .status_first = (statuses_before ? statuses_before[0].id : "deadbeef"), */
+/*             .status_last = (statuses_after ? statuses_after[stat_after_len-1].id : "deadbeef"), */
+/*             .status_before = (statuses_before && enough_statuses_before ? statuses_before[stat_before_len - stat_before_limit].id : "deadbeef"), */
+/*             .status_after = (statuses_after && enough_statuses_after ? */
+/*                              statuses_after[stat_after_limit].id : "deadbeef"), */
+/*         }; */
+/*         thread_pagination = tmpl_gen_thread_page_btn(&pagination_tmpl, NULL); */
+/*     } */
         
 
-    easprintf(&output, "%s%s%s%s%s%s",
-              thread_pagination ? thread_pagination : "",
-              before_html ? before_html : "",
-              stat_html ? stat_html : "",
-              stat_reply ? stat_reply : "",
-              after_html ? after_html : "",
-              thread_pagination ? thread_pagination : "");
+/*     easprintf(&output, "%s%s%s%s%s%s", */
+/*               thread_pagination ? thread_pagination : "", */
+/*               before_html ? before_html : "", */
+/*               stat_html ? stat_html : "", */
+/*               stat_reply ? stat_reply : "", */
+/*               after_html ? after_html : "", */
+/*               thread_pagination ? thread_pagination : ""); */
+    
     
     struct base_page b = {
         .category = BASE_CAT_NONE,
-        .content = output,
+        .content = "test",
         .sidebar_left = NULL
     };
 
@@ -1128,18 +1129,18 @@ void content_status(PATH_ARGS, uint8_t flags)
     render_base_page(&b, req, ssn, api);
 
     // Cleanup
-    free(before_html);
-    free(stat_html);
-    free(after_html);
-    free(output);
-    free(thread_pagination);
-    if ((flags & STATUS_REPLY) == STATUS_REPLY)
-        free(stat_reply);
-    mstdnt_cleanup_statuses(statuses_before, stat_before_len);
-    mstdnt_cleanup_statuses(statuses_after, stat_after_len);
-    mstdnt_cleanup_status(&status);
-    mastodont_storage_cleanup(&storage);
-    mastodont_storage_cleanup(&status_storage);
+    /* free(before_html); */
+    /* free(stat_html); */
+    /* free(after_html); */
+    /* free(output); */
+    /* free(thread_pagination); */
+    /* if ((flags & STATUS_REPLY) == STATUS_REPLY) */
+    /*     free(stat_reply); */
+    /* mstdnt_cleanup_statuses(statuses_before, stat_before_len); */
+    /* mstdnt_cleanup_statuses(statuses_after, stat_after_len); */
+    /* mstdnt_cleanup_status(&status); */
+    /* mastodont_storage_cleanup(&storage); */
+    /* mastodont_storage_cleanup(&status_storage); */
 }
 
 void notice_redirect(PATH_ARGS)
diff --git a/static/status.tmpl b/static/status.tmpl
index ca7bcd2..5dc2fd9 100644
--- a/static/status.tmpl
+++ b/static/status.tmpl
@@ -1,53 +1,53 @@
 <input type="checkbox" class="status-hide" id="status-toggle-{{%s:status_id}}" {{ %s:thread_hidden }}>
 <div class="status" id="{{%s:status_id}}">
-  {{ %s : notif_info }}
-  <table class="status-table ui-table">
-    <tr>
-      <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
-        <img src="{{%s:avatar}}" loading="lazy">
-      </td>
-      <td class="status-info">
-        <div class="poster-stats">
-          <span class="username">{{%s:username}}</span>
-          <a class="instance-info" href="{{%s:prefix}}/@{{%s:acct}}">{{%s:acct}}</a>
-          <span class="alignend">
-            <div class="menu-container status-visibility">
-              {{%s:visibility}}
-              <div class="menu">
-                <ul>
-                  <li>
-                    <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-                      <input type="hidden" name="itype" value="{{%s:unmute}}mute">
-                      <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
-                    </form>
-                  </li>
-                  <li>
-                    <form action="{{%s:prefix}}/status/{{%s:status_id}/interact" method="post">
-                      <input type="hidden" name="itype" value="{{%s:unbookmark}}bookmark">
-                      <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
-                    </form>
-                  </li>
-                  {{%s:pin_status}}
-                  {{%s:delete_status}}
-                </ul>
-              </div>
-            </div>
-            <label for="status-toggle-{{%s:status_id}}" class="status-view"></label>
-          </span>
-        </div>
-        <div class="status-data">
-          {{%s:in_reply_to_str}}
-          <span class="status-content">
-            {{%s:status_content}}
-          </span>
-          {{%s:attachments}}
-          {{%s:interactions}}
-          {{%s:emoji_reactions}}
-          {{%s:interaction_btns}}
-        </div>
-      </td>
-    </tr>
-  </table>
+    {{ %s : notif_info }}
+    <table class="status-table ui-table">
+        <tr>
+            <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
+                <img src="{{%s:avatar}}" loading="lazy">
+            </td>
+            <td class="status-info">
+                <div class="poster-stats">
+                    <span class="username">{{%s:username}}</span>
+                    <a class="instance-info" href="{{%s:prefix}}/@{{%s:acct}}">{{%s:acct}}</a>
+                    <span class="alignend">
+                        <div class="menu-container status-visibility">
+                            {{%s:visibility}}
+                            <div class="menu">
+                                <ul>
+                                    <li>
+                                        <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
+                                            <input type="hidden" name="itype" value="{{%s:unmute}}mute">
+                                            <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
+                                        </form>
+                                    </li>
+                                    <li>
+                                        <form action="{{%s:prefix}}/status/{{%s:status_id}/interact" method="post">
+                                            <input type="hidden" name="itype" value="{{%s:unbookmark}}bookmark">
+                                            <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
+                                        </form>
+                                    </li>
+                                    {{%s:pin_status}}
+                                    {{%s:delete_status}}
+                                </ul>
+                            </div>
+                        </div>
+                        <label for="status-toggle-{{%s:status_id}}" class="status-view"></label>
+                    </span>
+                </div>
+                <div class="status-data">
+                    {{%s:in_reply_to_str}}
+                    <span class="status-content">
+                        {{%s:status_content}}
+                    </span>
+                    {{%s:attachments}}
+                    {{%s:interactions}}
+                    {{%s:emoji_reactions}}
+                    {{%s:interaction_btns}}
+                </div>
+            </td>
+        </tr>
+    </table>
 </div>
 <input type="checkbox" class="quickreply-hide hidden" id="status-quickreply-{{%s:status_id}}">
 {{ %s : reply }}
diff --git a/templates/main.tt b/templates/main.tt
index 13e20ad..dd01af4 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -122,6 +122,12 @@
                 </tr>
               </table>
             </div>
+
+            <!-- Notifications -->
+            [% FOREACH notif IN notifs %]
+              [% notification_compact(ssn, data, notif) %]
+            [% END %]
+            
             [% ELSE %]
             <div class="sidebar-login">
               <form action="$prefix/login" method="post">
diff --git a/templates/notif_compact.tt b/templates/notif_compact.tt
new file mode 100644
index 0000000..3f5536a
--- /dev/null
+++ b/templates/notif_compact.tt
@@ -0,0 +1,17 @@
+<table class="notification-compact notification ui-table">
+  <tr>
+    <td class="pfp-compact-td">
+      <img src="[% notif.account.avatar %]">
+    </td>
+    <td>
+      <div class="notification-info">
+        <span class="notification-text-group">
+          <span title="[% notif.account.acct %]" class="username">[% notif.account.display_name %]</span>
+          <span class="action">{{%s:action}}</span>
+        </span> {{%s:notif_svg}}
+      </div>
+      <div class="notification-content {{%s:is_status}}">{{%s:content}}</div>
+      <div class="notification-stats">{{%s:stats}}</div>
+    </td>
+  </tr>
+</table>
diff --git a/templates/status.tt b/templates/status.tt
new file mode 100644
index 0000000..ae35aec
--- /dev/null
+++ b/templates/status.tt
@@ -0,0 +1,68 @@
+<input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]" {{ %s:thread_hidden }}>
+<div class="status" id="[% status.id %]">
+    [% notif_info %]
+    <table class="status-table ui-table">
+        <tr>
+            <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
+                <img src="{{%s:avatar}}" loading="lazy">
+            </td>
+            <td class="status-info">
+                <div class="poster-stats">
+                    <span class="username">[% status.account.display_name %]</span>
+                    <a class="instance-info" href="$prefix/@{{%s:acct}}">[% status.account.acct %]</a>
+                    <span class="alignend">
+                        <div class="menu-container status-visibility">
+                            {{%s:visibility}}
+                            <div class="menu">
+                                <ul>
+                                    <li>
+                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                            <input type="hidden" name="itype" value="mute">
+                                            <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
+                                        </form>
+                                    </li>
+                                    <li>
+                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                            <input type="hidden" name="itype" value="bookmark">
+                                            <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
+                                        </form>
+                                    </li>
+                                    [%# pin %]
+                                    <li>
+                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                            <input type="hidden" name="itype" value="pin">
+                                            <input type="submit" class="btn-menu" value="{{%s:text}}">
+                                        </form>
+                                    </li>
+                                    [%# Delete %]
+                                    <li>
+                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                            <input type="hidden" name="itype" value="delete">
+                                            <input type="submit" class="btn-menu" value="{{%s:text}}">
+                                        </form>
+                                    </li>
+
+                                </ul>
+                            </div>
+                        </div>
+                        <label for="status-toggle-[% status.id %]" class="status-view"></label>
+                    </span>
+                </div>
+                <div class="status-data">
+                    [%# Note: The id may actually (99.5% of the time) be the acct %]
+                    [% status.in_reply_to_id %]
+                    <span class="status-content">
+                        [% status.content %]
+                    </span>
+                    {{%s:attachments}}
+                    {{%s:interactions}}
+                    {{%s:emoji_reactions}}
+                    {{%s:interaction_btns}}
+                </div>
+            </td>
+        </tr>
+    </table>
+</div>
+<input type="checkbox" class="quickreply-hide hidden" id="status-quickreply-[% status.id %]">
+{{ %s : reply }}
+

From 588bfc2126eed606b16b12b5d3658a0aea1c3ae5 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 27 Jul 2022 05:10:07 +0000
Subject: [PATCH 013/143] More progress

FossilOrigin-Name: 87d1a1fa92872a66a37bd82ea9cc2e687f4107c45855a115b49193953c9b770e
---
 perl/main.pl                |   6 +-
 perl/status.pm              |   7 ++
 src/base_page.c             |  15 +++--
 src/base_page.h             |   2 +-
 src/global_perl.c           |   4 +-
 src/global_perl.h           |   7 +-
 src/main.c                  |  26 +++++++-
 src/status.c                | 128 ++++++++++++------------------------
 templates/content_status.tt |   1 +
 9 files changed, 97 insertions(+), 99 deletions(-)
 create mode 100644 templates/content_status.tt

diff --git a/perl/main.pl b/perl/main.pl
index 541df31..e9529ec 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -5,6 +5,7 @@ use Template;
 use l10n qw( %L10N );
 use notifications qw( notification_compact );
 use template_helpers qw( &to_template );
+use status ();
 
 # my $template = Template->new(
 #     {
@@ -16,7 +17,10 @@ use template_helpers qw( &to_template );
 
 sub base_page
 {
-    my ($ssn, $data, $main, $notifs) = @_;
+    my ($ssn,
+        $data,
+        $main,
+        $notifs) = @_;
     my $result;
 
     my %vars = (
diff --git a/perl/status.pm b/perl/status.pm
index a269e44..f14f2fc 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -17,3 +17,10 @@ sub status
 
     to_template(\%vars, \$data->{'status.tt'});
 }
+
+sub content_status
+{
+    my ($ssn, $data, $statuses) = @_;
+
+    to_template(\%name, \$data->{'content_status.tt'});
+}
diff --git a/src/base_page.c b/src/base_page.c
index 8d9ce19..68c92db 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -73,15 +73,19 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     }
 
     // Init perl stack
+    perl_lock();
     dSP;
     ENTER;
     SAVETMPS;
     PUSHMARK(SP);
 
-    HV* session_hv = perlify_session(ssn);
-    XPUSHs(sv_2mortal(newRV_inc((SV*)session_hv)));
-    XPUSHs(sv_2mortal(newRV_inc((SV*)template_files)));
+    if (page->session)
+        mXPUSHs(newRV_inc(page->session));
+    else
+        mXPUSHs(newRV_inc((SV*)perlify_session(ssn)));
+    XPUSHs(newRV_inc((SV*)template_files));
     XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
+
     if (notifs && notifs_len)
     {
         AV* notifs_av = perlify_notifications(notifs, notifs_len);
@@ -94,13 +98,12 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     call_pv("base_page", G_SCALAR);
     SPAGAIN;
 
-    char* data = POPp;
-    
-    send_result(req, NULL, "text/html", data, 0);
+    send_result(req, NULL, "text/html", POPp, 0);
 cleanup:
     PUTBACK;
     FREETMPS;
     LEAVE;
+    perl_unlock();
     
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
diff --git a/src/base_page.h b/src/base_page.h
index 48ca5f4..4538390 100644
--- a/src/base_page.h
+++ b/src/base_page.h
@@ -25,7 +25,6 @@
 #include "l10n.h"
 #include "local_config.h"
 #include "path.h"
-
 enum base_category
 {
     BASE_CAT_NONE,
@@ -46,6 +45,7 @@ struct base_page
     enum base_category category;
     char* content;
     char* sidebar_left;
+    HV* session;
 };
 
 void render_base_page(struct base_page* page, FCGX_Request* req, struct session* ssn, mastodont_t* api);
diff --git a/src/global_perl.c b/src/global_perl.c
index ea0cf2c..4d37b4b 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -22,7 +22,8 @@
 #include "../templates/notif_compact.ctt"
 #include "../templates/status.ctt"
 
-const HV* template_files;
+HV* template_files;
+pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 void init_template_files()
 {
@@ -31,6 +32,7 @@ void init_template_files()
     hv_stores(template_files, "main.tt", newSVpv(data_main_tt, data_main_tt_size));
     hv_stores(template_files, "notif_compact.tt", newSVpv(data_notif_compact_tt, data_notif_compact_tt_size));
     hv_stores(template_files, "status.tt", newSVpv(data_status_tt, data_status_tt_size));
+    hv_stores(template_files, "content_status.tt", newSVpv(data_status_tt, data_status_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/global_perl.h b/src/global_perl.h
index ebc9634..78e501b 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -20,6 +20,7 @@
 #define GLOBAL_PERL_H
 #include <EXTERN.h>
 #include <perl.h>
+#include <pthread.h>
 
 //    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
 #define hvstores_str(hv, key, val) hv_stores((hv), key, ((val) ? newSVpv((val), 0) : &PL_sv_undef))
@@ -28,7 +29,11 @@
                                              ((val) ? newRV_inc((SV* const)(val)) : &PL_sv_undef))
 
 static PerlInterpreter* perl;
-extern const HV* template_files;
+extern HV* template_files;
+extern pthread_mutex_t perl_mutex;
+
+#define perl_lock() if(1) { pthread_mutex_lock(&perl_mutex); }
+#define perl_unlock() if(1) { pthread_mutex_unlock(&perl_mutex); }
 
 void init_template_files();
 void cleanup_template_files();
diff --git a/src/main.c b/src/main.c
index 7d390ea..fd021a1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <fcgi_stdio.h>
 #include <EXTERN.h>
 #include <perl.h>
 #include <pthread.h>
-#include <fcgi_stdio.h>
 #include "global_perl.h"
 #include <fcgiapp.h>
 #include <string.h>
@@ -55,6 +55,8 @@ static void xs_init (pTHX);
 
 EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
+static int terminate = 0;
+
 /*******************
  *  Path handling  *
  ******************/
@@ -181,7 +183,7 @@ static void* cgi_start(void* arg)
     FCGX_Request req;
     FCGX_InitRequest(&req, 0, 0);
 
-    while (1)
+    while (!terminate)
     {
         static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -195,6 +197,7 @@ static void* cgi_start(void* arg)
         FCGX_Finish_r(&req);
     }
 
+
     return NULL;
 }
 
@@ -204,8 +207,20 @@ EXTERN_C void xs_init(pTHX)
        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
 
+void term(int signum)
+{
+    FCGX_ShutdownPending();
+    terminate = 1;
+}
+
 int main(int argc, char **argv, char **env)
 {
+    struct sigaction action = {
+        .sa_handler = term
+    };
+    sigaction(SIGTERM, &action, NULL);
+    sigaction(SIGINT, &action, NULL);
+    
     // Global init
     mastodont_global_curl_init();
     FCGX_Init();
@@ -243,9 +258,14 @@ int main(int argc, char **argv, char **env)
     mastodont_global_curl_cleanup();
 
     cleanup_template_files();
+    
+    FCGX_ShutdownPending();
+
+    for (unsigned i = 0; i < THREAD_COUNT; ++i)
+        pthread_join(id[i], NULL);
 
     perl_destruct(perl);
     perl_free(perl);
     PERL_SYS_TERM();
-    return EXIT_SUCCESS;
+    return 4;
 }
diff --git a/src/status.c b/src/status.c
index d877665..67d5eea 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1041,106 +1041,62 @@ void content_status_interactions(FCGX_Request* req,
 
 void content_status(PATH_ARGS, uint8_t flags)
 {
-/*     struct mstdnt_args m_args; */
-/*     set_mstdnt_args(&m_args, ssn); */
-/*     char* output; */
-/*     // Status context */
-/*     struct mstdnt_storage storage = {0}, status_storage = {0}; */
-/*     struct mstdnt_status* statuses_before = NULL, */
-/*         *statuses_after = NULL, */
-/*         status = { 0 }; */
-/*     size_t stat_before_len = 0, stat_after_len = 0; */
-/*     char* before_html = NULL, *stat_html = NULL, *after_html = NULL, *stat_reply = NULL, */
-/*         * thread_pagination = NULL; */
-
-/*     int stat_after_limit = 15; */
-/*     int stat_before_limit = 15; */
-/* #define enough_statuses_before (stat_before_len > stat_before_limit) */
-/* #define enough_statuses_after (stat_after_len > stat_after_limit) */
-
-/*     try_post_status(ssn, api); */
-/*     mastodont_get_status_context(api, */
-/*                                  &m_args, */
-/*                                  data[0], */
-/*                                  &storage, */
-/*                                  &statuses_before, &statuses_after, */
-/*                                  &stat_before_len, &stat_after_len); */
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    struct mstdnt_storage storage = {0}, status_storage = {0};
+    struct mstdnt_status* statuses_before = NULL,
+        *statuses_after = NULL,
+        status = { 0 };
+    size_t stat_before_len = 0, stat_after_len = 0;
     
-/*     // Get information */
-/*     if (mastodont_get_status(api, &m_args, data[0], &status_storage, &status)) */
-/*     { */
-/*         stat_html = construct_error("Status not found", E_ERROR, 1, NULL); */
-/*     } */
-/*     else { */
-/*         before_html = construct_statuses(ssn, api, */
-/*                                          (enough_statuses_before ? */
-/*                                           statuses_before + (stat_before_len - stat_before_limit) : statuses_before), */
-/*                                          (enough_statuses_before ? */
-/*                                           stat_before_limit : stat_before_len), */
-/*                                          NULL, 0); */
+    try_post_status(ssn, api);
+    mastodont_get_status(api, &m_args, data[0], &status_storage, &status);
+    mastodont_get_status_context(api,
+                                 &m_args,
+                                 data[0],
+                                 &storage,
+                                 &statuses_before, &statuses_after,
+                                 &stat_before_len, &stat_after_len);
 
-/*         // Current status */
-/*         stat_html = construct_status(ssn, api, &status, NULL, NULL, NULL, flags); */
-/*         if ((flags & STATUS_REPLY) == STATUS_REPLY) */
-/*         { */
-/*             stat_reply = reply_status(ssn, */
-/*                                       data[0], */
-/*                                       &status); */
-/*         } */
-/*     } */
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_inc((SV*)session_hv));
+    XPUSHs(newRV_inc((SV*)template_files));
+    // ARGS
+    PUTBACK;
+    call_pv("status::content_status", G_SCALAR);
+    SPAGAIN;
 
-/*     // After... */
-/*     // For pagination, we already start at the first, so no math required here */
-/*     after_html = construct_statuses(ssn, api, statuses_after, */
-/*                                     (enough_statuses_after ? stat_after_limit : stat_after_len), */
-/*                                     NULL, 0); */
+    malloc(1024);
 
-/*     // Thread pagination buttons */
-/*     if (statuses_before || statuses_after) */
-/*     { */
-/*         struct thread_page_btn_template pagination_tmpl = { */
-/*             .prefix = config_url_prefix, */
-/*             .status_first = (statuses_before ? statuses_before[0].id : "deadbeef"), */
-/*             .status_last = (statuses_after ? statuses_after[stat_after_len-1].id : "deadbeef"), */
-/*             .status_before = (statuses_before && enough_statuses_before ? statuses_before[stat_before_len - stat_before_limit].id : "deadbeef"), */
-/*             .status_after = (statuses_after && enough_statuses_after ? */
-/*                              statuses_after[stat_after_limit].id : "deadbeef"), */
-/*         }; */
-/*         thread_pagination = tmpl_gen_thread_page_btn(&pagination_tmpl, NULL); */
-/*     } */
-        
+    // Duplicate so we can free the TMPs
+    char* dup = savesharedsvpv(POPs);
 
-/*     easprintf(&output, "%s%s%s%s%s%s", */
-/*               thread_pagination ? thread_pagination : "", */
-/*               before_html ? before_html : "", */
-/*               stat_html ? stat_html : "", */
-/*               stat_reply ? stat_reply : "", */
-/*               after_html ? after_html : "", */
-/*               thread_pagination ? thread_pagination : ""); */
-    
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
     
     struct base_page b = {
         .category = BASE_CAT_NONE,
-        .content = "test",
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
     // Output
     render_base_page(&b, req, ssn, api);
 
-    // Cleanup
-    /* free(before_html); */
-    /* free(stat_html); */
-    /* free(after_html); */
-    /* free(output); */
-    /* free(thread_pagination); */
-    /* if ((flags & STATUS_REPLY) == STATUS_REPLY) */
-    /*     free(stat_reply); */
-    /* mstdnt_cleanup_statuses(statuses_before, stat_before_len); */
-    /* mstdnt_cleanup_statuses(statuses_after, stat_after_len); */
-    /* mstdnt_cleanup_status(&status); */
-    /* mastodont_storage_cleanup(&storage); */
-    /* mastodont_storage_cleanup(&status_storage); */
+    mstdnt_cleanup_statuses(statuses_before, stat_before_len);
+    mstdnt_cleanup_statuses(statuses_after, stat_after_len);
+    mstdnt_cleanup_status(&status);
+    mastodont_storage_cleanup(&storage);
+    mastodont_storage_cleanup(&status_storage);
+    Safefree(dup);
 }
 
 void notice_redirect(PATH_ARGS)
diff --git a/templates/content_status.tt b/templates/content_status.tt
new file mode 100644
index 0000000..bf7e899
--- /dev/null
+++ b/templates/content_status.tt
@@ -0,0 +1 @@
+asdasd

From eba2a360e068fe7cc3a292c5cc31fc0e3b6b87fb Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 27 Jul 2022 05:26:41 +0000
Subject: [PATCH 014/143] asd

FossilOrigin-Name: 2cad6235808b58a0041bad16b9bf72102dcfd797023686b28b2a17a6fcd25be0
---
 src/main.c   | 29 ++++++++---------------------
 src/status.c |  2 --
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/main.c b/src/main.c
index fd021a1..82e2101 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,8 +55,6 @@ static void xs_init (pTHX);
 
 EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
-static int terminate = 0;
-
 /*******************
  *  Path handling  *
  ******************/
@@ -183,7 +181,7 @@ static void* cgi_start(void* arg)
     FCGX_Request req;
     FCGX_InitRequest(&req, 0, 0);
 
-    while (!terminate)
+    while (1)
     {
         static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -207,20 +205,8 @@ EXTERN_C void xs_init(pTHX)
        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
 
-void term(int signum)
-{
-    FCGX_ShutdownPending();
-    terminate = 1;
-}
-
 int main(int argc, char **argv, char **env)
 {
-    struct sigaction action = {
-        .sa_handler = term
-    };
-    sigaction(SIGTERM, &action, NULL);
-    sigaction(SIGINT, &action, NULL);
-    
     // Global init
     mastodont_global_curl_init();
     FCGX_Init();
@@ -252,20 +238,21 @@ int main(int argc, char **argv, char **env)
 
     // Hell, let's not sit around here either
     cgi_start(&api);
+    
+    FCGX_ShutdownPending();
+    
+    for (unsigned i = 0; i < THREAD_COUNT; ++i)
+        pthread_join(id[i], NULL);
    
     free_instance_info_cache();
-    mastodont_cleanup(&api);
     mastodont_global_curl_cleanup();
+    mastodont_cleanup(&api);
 
     cleanup_template_files();
     
-    FCGX_ShutdownPending();
-
-    for (unsigned i = 0; i < THREAD_COUNT; ++i)
-        pthread_join(id[i], NULL);
 
     perl_destruct(perl);
     perl_free(perl);
     PERL_SYS_TERM();
-    return 4;
+    return 0;
 }
diff --git a/src/status.c b/src/status.c
index 67d5eea..844d89f 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1071,8 +1071,6 @@ void content_status(PATH_ARGS, uint8_t flags)
     call_pv("status::content_status", G_SCALAR);
     SPAGAIN;
 
-    malloc(1024);
-
     // Duplicate so we can free the TMPs
     char* dup = savesharedsvpv(POPs);
 

From 253f55dd366af31a8102500b9d447b159f8d9931 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 28 Jul 2022 03:36:33 +0000
Subject: [PATCH 015/143] Improved unit testing

FossilOrigin-Name: 786b4080abc83f076704b33ec884236a3733fef9a5a276d7df54fa35d228015b
---
 .fossil-settings/ignore-glob               |  3 +-
 Makefile                                   | 18 ++++++++--
 test/test.pl                               | 39 ++++++++++++++++++++++
 test/unit/main.c                           | 33 ------------------
 test/unit/{string_test.c => t00_string.c}  |  7 +++-
 test/unit/{mime_multipart.c => t01_mime.c} |  5 ++-
 6 files changed, 66 insertions(+), 39 deletions(-)
 create mode 100755 test/test.pl
 delete mode 100644 test/unit/main.c
 rename test/unit/{string_test.c => t00_string.c} (84%)
 rename test/unit/{mime_multipart.c => t01_mime.c} (96%)

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 6f37e23..97604c9 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -11,4 +11,5 @@ config.h
 treebird
 test/tests
 scripts/*.o
-templates/*.ctt
\ No newline at end of file
+templates/*.ctt
+test/unit/*.bin
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 785e0da..0689bca 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,14 @@ PAGES_CMP = $(patsubst %.tmpl,%.ctmpl,$(PAGES))
 PAGES_C = $(patsubst %.tmpl, %.c,$(PAGES))
 PAGES_C_OBJ = $(patsubst %.c,%.o,$(PAGES_C))
 TMPLS_C = $(patsubst %.tt,%.ctt,$(TMPLS))
+TEST_DIR = test/unit
+TESTS = $(wildcard $(TEST_DIR)/t*.c)
+UNIT_TESTS = $(patsubst %.c,%.bin,$(TESTS))
 DIST = dist/
 PREFIX ?= /usr/local
 TARGET = treebird
+# For tests
+OBJ_NO_MAIN = $(filter-out src/main.o,$(OBJ))
 
 MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 
@@ -69,8 +74,9 @@ install: $(TARGET)
 	install -d $(PREFIX)/share/treebird/
 	cp -r dist/ $(PREFIX)/share/treebird/
 
-test:
-	make -C test
+test: all $(UNIT_TESTS)
+	@echo " ... Tests ready"
+	@./test/test.pl
 
 dep_build:
 	make -C $(MASTODONT_DIR)
@@ -78,12 +84,18 @@ dep_build:
 %.o: %.c %.h $(PAGES)
 	$(CC) $(CFLAGS) -c $< -o $@
 
+# For tests
+%.bin: %.c
+	@$(CC) $(CFLAGS) $< -o $@ $(OBJ_NO_MAIN) $(PAGES_C_OBJ) $(LDFLAGS)
+	@echo -n " $@"
+
 clean:
 	rm -f $(OBJ) src/file-to-c/main.o
 	rm -f $(PAGES_CMP)
 	rm -f $(TMPLS_C)
+	rm -f test/unit/*.bin
 	rm -f filec ctemplate
-	rm $(TARGET)
+	rm $(TARGET) || true
 	make -C $(MASTODONT_DIR) clean
 
 clean_deps:
diff --git a/test/test.pl b/test/test.pl
new file mode 100755
index 0000000..faf5cce
--- /dev/null
+++ b/test/test.pl
@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use Data::Dumper;
+
+my $FAIL = "\033[91m";
+my $OK = "\033[96m";
+my $SUCCESS = "\033[92m";
+my $ENDC = "\033[0m";
+
+sub read_file
+{
+    my ($filename) = @_;
+    open my $fh, '<', $filename or die "Error opening $filename: $!";
+
+    do { local $/; <$fh> };
+}
+
+my @files_glob = glob('./test/unit/t*.bin');
+my $fail = 0;
+
+foreach my $bin (@files_glob)
+{
+    my $content = read_file(substr($bin, 0, -4) . ".c");
+    my ($name, $valgrind) = $content =~ /\/\*.*INFO name='(.*?)'.*valgrind=(.*?)\s\*\//s;
+
+    
+    if (system(($bin)))
+    {
+        print "$FAIL -- !! -- Test '$name' failed!$ENDC\n";
+        $fail = 1;
+        last;
+    }
+    else {
+        print "$OK -- OK -- Test '$name' passed$ENDC\n";
+    }
+}
+
+print "$SUCCESS -- All Tests passed!$ENDC\n" unless $fail;
diff --git a/test/unit/main.c b/test/unit/main.c
deleted file mode 100644
index ace6823..0000000
--- a/test/unit/main.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "../test.h"
-
-// Imports
-#include "mime_multipart.c"
-#include "string_test.c"
-int main()
-{
-    struct test tests[] = {
-        { "Mime multipart parser", mime_multipart_test },
-        { "Strings", string_replace_test }
-    };
-    return iterate_tests(tests, sizeof(tests)/sizeof(tests[0]));
-}
diff --git a/test/unit/string_test.c b/test/unit/t00_string.c
similarity index 84%
rename from test/unit/string_test.c
rename to test/unit/t00_string.c
index 9981849..b68745c 100644
--- a/test/unit/string_test.c
+++ b/test/unit/t00_string.c
@@ -1,7 +1,12 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #include "../../src/string.h"
 
-int string_replace_test(void)
+/* INFO name='Dummy test' valgrind=0 */
+
+int main(void)
 {
     char* res1 = strrepl("hello world", "wo", "swi", STRREPL_ALL);
     assert(strcmp(res1, "hello swirld") == 0);
diff --git a/test/unit/mime_multipart.c b/test/unit/t01_mime.c
similarity index 96%
rename from test/unit/mime_multipart.c
rename to test/unit/t01_mime.c
index 99ba7c5..f3cbf9a 100644
--- a/test/unit/mime_multipart.c
+++ b/test/unit/t01_mime.c
@@ -18,6 +18,9 @@
 
 #include <string.h>
 #include <assert.h>
+#include <stdlib.h>
+
+/* INFO name='Mime checking' valgrind=0 */
 
 void mime_boundary_check(void)
 {
@@ -62,7 +65,7 @@ void form_check(void)
     free(multipart);
 }
 
-int mime_multipart_test(void)
+int main(void)
 {
     mime_boundary_check();
     form_check();

From 9069a17a412033071c92e2fba0aa86507f804c6b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 28 Jul 2022 05:14:24 +0000
Subject: [PATCH 016/143] Statuses

FossilOrigin-Name: cff813d2d65c0ce99156358724ecff352e0c5a25feb605f2a46f48b0869cf80b
---
 perl/l10n.pm                |   9 +-
 perl/main.pl                |   4 +-
 perl/notifications.pm       |   3 +-
 perl/status.pm              |  17 +-
 perl/template_helpers.pm    |   3 +-
 src/global_perl.c           |   3 +-
 src/status.c                |  25 +++
 src/status.h                |   3 +-
 templates/content_status.tt |   8 +-
 templates/main.tt           | 306 ++++++++++++++++++------------------
 10 files changed, 216 insertions(+), 165 deletions(-)

diff --git a/perl/l10n.pm b/perl/l10n.pm
index e69fee3..b546acc 100644
--- a/perl/l10n.pm
+++ b/perl/l10n.pm
@@ -2,7 +2,7 @@ package l10n;
 
 use Exporter 'import';
 
-our @EXPORT = qw( %L10N );
+our @EXPORT = qw( &lang %L10N );
 
 our %L10N = (
     EN_US => {
@@ -86,6 +86,11 @@ our %L10N = (
         NOTIF_COMPACT_POLL => 'poll',
     },
     # TODO bring over Spanish and Chinese
-);
+    );
+
+sub lang
+{
+    $L10N{'EN_US'}->{shift(@_)}
+}
 
 return 1;
diff --git a/perl/main.pl b/perl/main.pl
index e9529ec..e7e6b7c 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 # Modules
 use Template;
-use l10n qw( %L10N );
+use l10n qw( &lang %L10N );
 use notifications qw( notification_compact );
 use template_helpers qw( &to_template );
 use status ();
@@ -27,7 +27,7 @@ sub base_page
         prefix => '',
         ssn => $ssn,
         title => $L10N{'EN_US'}->{'APP_NAME'},
-        lang => sub { $L10N{'EN_US'}->{shift(@_)} },
+        lang => \&lang,
         main => $main,
         sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
         acct => $ssn->{account},
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 613c946..c97377a 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -1,5 +1,6 @@
 package notifications;
-
+use strict;
+use warnings;
 use Exporter 'import';
 
 our @EXPORT = qw( notification_compact );
diff --git a/perl/status.pm b/perl/status.pm
index f14f2fc..232b621 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,5 +1,6 @@
 package status;
-
+use strict;
+use warnings;
 use Exporter 'import';
 
 our @EXPORT = qw( status );
@@ -20,7 +21,17 @@ sub status
 
 sub content_status
 {
-    my ($ssn, $data, $statuses) = @_;
+    my ($ssn, $data, $status, $statuses_before, $statuses_after) = @_;
 
-    to_template(\%name, \$data->{'content_status.tt'});
+    my %vars = (
+        ssn => $ssn,
+        data => $data,
+        create_status => \&status,
+        status => $status,
+        statuses_before => $statuses_before,
+        statuses_after => $statuses_after,
+        );
+
+
+    to_template(\%vars, \$data->{'content_status.tt'});
 }
diff --git a/perl/template_helpers.pm b/perl/template_helpers.pm
index a31a11c..0e74d6a 100644
--- a/perl/template_helpers.pm
+++ b/perl/template_helpers.pm
@@ -1,5 +1,6 @@
 package template_helpers;
-
+use strict;
+use warnings;
 use Exporter 'import';
 
 our @EXPORT = qw( &to_template );
diff --git a/src/global_perl.c b/src/global_perl.c
index 4d37b4b..0bae575 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -21,6 +21,7 @@
 #include "../templates/main.ctt"
 #include "../templates/notif_compact.ctt"
 #include "../templates/status.ctt"
+#include "../templates/content_status.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -32,7 +33,7 @@ void init_template_files()
     hv_stores(template_files, "main.tt", newSVpv(data_main_tt, data_main_tt_size));
     hv_stores(template_files, "notif_compact.tt", newSVpv(data_notif_compact_tt, data_notif_compact_tt_size));
     hv_stores(template_files, "status.tt", newSVpv(data_status_tt, data_status_tt_size));
-    hv_stores(template_files, "content_status.tt", newSVpv(data_status_tt, data_status_tt_size));
+    hv_stores(template_files, "content_status.tt", newSVpv(data_content_status_tt, data_content_status_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/status.c b/src/status.c
index 844d89f..58638be 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1066,6 +1066,16 @@ void content_status(PATH_ARGS, uint8_t flags)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_inc((SV*)session_hv));
     XPUSHs(newRV_inc((SV*)template_files));
+    XPUSHs(newRV_inc((SV*)perlify_status(&status)));
+    if (statuses_before)
+        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_before, stat_before_len)));
+    else
+        XPUSHs(&PL_sv_undef);
+    
+    if (statuses_after)
+        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_after, stat_after_len)));
+    else
+        XPUSHs(&PL_sv_undef);
     // ARGS
     PUTBACK;
     call_pv("status::content_status", G_SCALAR);
@@ -1134,3 +1144,18 @@ HV* perlify_status(const struct mstdnt_status* status)
 
     return status_hv;
 }
+
+
+AV* perlify_statuses(const struct mstdnt_status* statuses, size_t len)
+{
+    if (!(statuses && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_status(statuses + i)));
+    }
+
+    return av;
+}
diff --git a/src/status.h b/src/status.h
index 0041ce7..7a3c36c 100644
--- a/src/status.h
+++ b/src/status.h
@@ -136,6 +136,7 @@ void notice_redirect(PATH_ARGS);
 void api_status_interact(PATH_ARGS);
 
 // Perl
-HV* perlify_status(const struct mstdnt_status* status); 
+HV* perlify_status(const struct mstdnt_status* status);
+AV* perlify_statuses(const struct mstdnt_status* statuses, size_t len); 
 
 #endif // STATUS_H
diff --git a/templates/content_status.tt b/templates/content_status.tt
index bf7e899..3cd6cc9 100644
--- a/templates/content_status.tt
+++ b/templates/content_status.tt
@@ -1 +1,7 @@
-asdasd
+[% FOREACH i IN statuses_before %]
+    [% create_status(ssn, data, i) %]
+[% END %]
+[% create_status(ssn, data, status) %]
+[% FOREACH i IN statuses_after %]
+    [% create_status(ssn, data, i) %]
+[% END %]
diff --git a/templates/main.tt b/templates/main.tt
index dd01af4..713398f 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -1,157 +1,157 @@
 <!DOCTYPE html>
 <html [% IF ssn.config.background_url %]style="background:url('[% ssn.config.background_url %]')"[% END %]>
-  <head>
-    <meta charset="utf-8">
-    <title>$title</title>
-    <link rel="icon" type="image/png" href="/favicon.png">
-    <link rel="stylesheet" type="text/css" href="/treebird.css">
-    [% IF !(ssn.config.theme == "treebird" && ssn.config.themeclr == 0) %]
-    <link
-      rel="stylesheet"
-      type="text/css"
-      href="/[% ssn.config.theme %][% IF ssn.config.themeclr %]-dark[% END %].css">
-    [% END %]
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ %s : title }} is a decentralized social media platform">
-    [% IF ssn.config.sidebar_opacity %]
-    <style>
-      :root { --sidebar-opacity: [% sidebar_opacity %]; }
-    </style>
-    [% END %]
-  </head>
-  <body>
-    <div id="main-page">
-      <header id="navbar">
-        <label for="leftbar-show">
-          <svg class="leftbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
-        </label>
-        <a href="{{ %s : prefix }}/"><img src="/treebird_logo.png" height="42"></a>
-        <span class="info">$title</span>
-        <label for="rightbar-show">
-          <svg class="rightbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"></path></svg>
-        </label>
-        <label for="searchbar-show">
-          <svg class="search-btn-show" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
-        </label>
-        <input type="checkbox" class="hidden" id="searchbar-show">
-        <div id="navbar-right-container">
-          <div id="navbar-right">
-            [% IF !ssn.logged_in -%]
-              <a href="login" id="login-header">Login / Register</a>
-            [%- END %]
-            <!-- Searchbox -->
-            <form action="{{ %s : prefix }}/search" method="get">
-              <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><!-- i hate HTML
-                                                                                                                                           --><input type="submit" class="btn group group-right" value="[% lang('SEARCH_BUTTON') %]">
-            </form>
-          </div>
+    <head>
+        <meta charset="utf-8">
+        <title>$title</title>
+        <link rel="icon" type="image/png" href="/favicon.png">
+        <link rel="stylesheet" type="text/css" href="/treebird.css">
+        [% IF !(ssn.config.theme == "treebird" && ssn.config.themeclr == 0) %]
+            <link
+                rel="stylesheet"
+                type="text/css"
+                href="/[% ssn.config.theme %][% IF ssn.config.themeclr %]-dark[% END %].css">
+        [% END %]
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="{{ %s : title }} is a decentralized social media platform">
+        [% IF ssn.config.sidebar_opacity %]
+            <style>
+             :root { --sidebar-opacity: [% sidebar_opacity %]; }
+            </style>
+        [% END %]
+    </head>
+    <body>
+        <div id="main-page">
+            <header id="navbar">
+                <label for="leftbar-show">
+                    <svg class="leftbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
+                </label>
+                <a href="{{ %s : prefix }}/"><img src="/treebird_logo.png" height="42"></a>
+                <span class="info">$title</span>
+                <label for="rightbar-show">
+                    <svg class="rightbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"></path></svg>
+                </label>
+                <label for="searchbar-show">
+                    <svg class="search-btn-show" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
+                </label>
+                <input type="checkbox" class="hidden" id="searchbar-show">
+                <div id="navbar-right-container">
+                    <div id="navbar-right">
+                        [% IF !ssn.logged_in -%]
+                            <a href="login" id="login-header">Login / Register</a>
+                        [%- END %]
+                        <!-- Searchbox -->
+                        <form action="{{ %s : prefix }}/search" method="get">
+                            <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><!-- i hate HTML
+                                                                                                                                                              --><input type="submit" class="btn group group-right" value="[% lang('SEARCH_BUTTON') %]">
+                        </form>
+                    </div>
+                </div>
+            </header>
+            <input type="checkbox" id="leftbar-show" class="hidden">
+            <input type="checkbox" id="rightbar-show" class="hidden">
+            <table id="content" class="ui-table">
+                <!-- Navigation -->
+                <tr>
+                    <td id="leftbar" class="sidebar">
+                        <ul>
+                            <li><a class="sidebarbtn {{ %s : active_home }}" href="$prefix/">[% lang('HOME') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_local }}" href="$prefix/local/">[% lang('LOCAL') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_federated }}" href="$prefix/federated/">[% lang('FEDERATED') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_notifications }}" href="$prefix/notifications">[% lang('NOTIFICATIONS') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_lists }}" href="$prefix/lists">[% lang('LISTS') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_favourites }}" href="$prefix/favourites">[% lang('FAVOURITES') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_bookmarks }}" href="$prefix/bookmarks">[% lang('BOOKMARKS') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_direct }}" href="$prefix/direct">[% lang('DIRECT') %]</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_chats }}" href="$prefix/chats">Chats</a></li>
+                            <li><a class="sidebarbtn {{ %s : active_config }}" href="$prefix/config">[% lang('CONFIG') %]</a></li>
+                        </ul>
+                        {{ %s : sidebar_leftbar }}
+                        <!-- <div class="static-html" id="instance-panel"></div> -->
+                        <div class="mini-links">
+                            <a href="{{%s:prefix}}/about">About</a>
+                            <span class="bullet-separate">&bull;</span>
+                            <a href="{{%s:prefix}}/about/license">License</a>
+                            <span class="bullet-separate">&bull;</span>
+                            <a href="https://fossil.nekobit.net/treebird">Source code</a>
+                        </div>
+                    </td>
+                    
+                    <!-- Display for posts -->
+                    <td id="main">
+                        $main
+                    </td>
+
+                    <!-- Notifications and such -->
+                    <td id="rightbar" class="sidebar">
+                        [% IF ssn.cookies.logged_in %]
+                            <div class="account-sidebar"
+                                 [%- IF acct.header -%]
+                                 style="background: linear-gradient(var(--account-overlay-gradient-top), var(--account-overlay-gradient-bottom)), url([% acct.header %]);"
+                                 [%- END %]>
+                                <table class="acct-info">
+                                    <tr>
+                                        <td>
+                                            <img src="[% acct.avatar %]" class="acct-pfp" loading="lazy">
+                                        </td>
+                                        <td class="acct-info-right">
+                                            <span class="username">[% acct.username %]</span>
+                                            <span class="acct">@<span class="acct-js-grep">[% acct.acct %]</span></span>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table class="acct-stats">
+                                    <tr>
+                                        <td class="header-btn btn">
+                                            <a href="$prefix/@[% acct.acct %]">
+                                                <span class="btn-header">[% lang('TAB_STATUSES') %]</span>
+                                                <span class="btn-content">[% acct.statuses_count %]</span>
+                                            </a>
+                                        </td>
+                                        <td class="header-btn btn">
+                                            <a href="$prefix/@[% acct.acct %]/following">
+                                                <span class="btn-header">[% lang('TAB_FOLLOWING') %]</span>
+                                                <span class="btn-content">[% acct.following_count %]</span>
+                                            </a>
+                                        </td>
+                                        <td class="header-btn btn">
+                                            <a href="$prefix/@[% acct.acct %]/followers">
+                                                <span class="btn-header">[% lang('TAB_FOLLOWERS') %]</span>
+                                                <span class="btn-content">[% acct.followers_count %]</span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+
+                            <!-- Notifications -->
+                            [% FOREACH notif IN notifs %]
+                                [% notification_compact(ssn, data, notif) %]
+                            [% END %]
+                            
+                        [% ELSE %]
+                            <div class="sidebar-login">
+                                <form action="$prefix/login" method="post">
+                                    <div class="form-group">
+                                        <label for="login-username">[% lang('USERNAME') %]: </label>
+                                        <input type="text" id="login-username" name="username">
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="login-password">[% lang('PASSWORD') %]: </label>
+                                        <input type="password" id="login-password" name="password"><br>
+                                    </div>
+                                    <div class="form-group">
+                                        <input class="btn" type="submit" value="[% lang('LOGIN_BTN') %]">
+                                    </div>
+                                </form>
+                            </div>
+                        [% END %]
+                    </td>
+                </tr>
+            </table>
         </div>
-      </header>
-      <input type="checkbox" id="leftbar-show" class="hidden">
-      <input type="checkbox" id="rightbar-show" class="hidden">
-      <table id="content" class="ui-table">
-        <!-- Navigation -->
-        <tr>
-          <td id="leftbar" class="sidebar">
-            <ul>
-              <li><a class="sidebarbtn {{ %s : active_home }}" href="$prefix/">[% lang('HOME') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_local }}" href="$prefix/local/">[% lang('LOCAL') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_federated }}" href="$prefix/federated/">[% lang('FEDERATED') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_notifications }}" href="$prefix/notifications">[% lang('NOTIFICATIONS') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_lists }}" href="$prefix/lists">[% lang('LISTS') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_favourites }}" href="$prefix/favourites">[% lang('FAVOURITES') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_bookmarks }}" href="$prefix/bookmarks">[% lang('BOOKMARKS') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_direct }}" href="$prefix/direct">[% lang('DIRECT') %]</a></li>
-              <li><a class="sidebarbtn {{ %s : active_chats }}" href="$prefix/chats">Chats</a></li>
-              <li><a class="sidebarbtn {{ %s : active_config }}" href="$prefix/config">[% lang('CONFIG') %]</a></li>
-            </ul>
-            {{ %s : sidebar_leftbar }}
-            <!-- <div class="static-html" id="instance-panel"></div> -->
-            <div class="mini-links">
-              <a href="{{%s:prefix}}/about">About</a>
-              <span class="bullet-separate">&bull;</span>
-              <a href="{{%s:prefix}}/about/license">License</a>
-              <span class="bullet-separate">&bull;</span>
-              <a href="https://fossil.nekobit.net/treebird">Source code</a>
-            </div>
-          </td>
-          
-          <!-- Display for posts -->
-          <td id="main">
-            $main
-          </td>
-
-          <!-- Notifications and such -->
-          <td id="rightbar" class="sidebar">
-            [% IF ssn.cookies.logged_in %]
-            <div class="account-sidebar"
-                 [%- IF acct.header -%]
-                 style="background: linear-gradient(var(--account-overlay-gradient-top), var(--account-overlay-gradient-bottom)), url([% acct.header %]);"
-                 [%- END %]>
-              <table class="acct-info">
-                <tr>
-                  <td>
-                    <img src="[% acct.avatar %]" class="acct-pfp" loading="lazy">
-                  </td>
-                  <td class="acct-info-right">
-                    <span class="username">[% acct.username %]</span>
-                    <span class="acct">@<span class="acct-js-grep">[% acct.acct %]</span></span>
-                  </td>
-                </tr>
-              </table>
-              <table class="acct-stats">
-                <tr>
-                  <td class="header-btn btn">
-                    <a href="$prefix/@[% acct.acct %]">
-                      <span class="btn-header">[% lang('TAB_STATUSES') %]</span>
-                      <span class="btn-content">[% acct.statuses_count %]</span>
-                    </a>
-                  </td>
-                  <td class="header-btn btn">
-                    <a href="$prefix/@[% acct.acct %]/following">
-                      <span class="btn-header">[% lang('TAB_FOLLOWING') %]</span>
-                      <span class="btn-content">[% acct.following_count %]</span>
-                    </a>
-                  </td>
-                  <td class="header-btn btn">
-                    <a href="$prefix/@[% acct.acct %]/followers">
-                      <span class="btn-header">[% lang('TAB_FOLLOWERS') %]</span>
-                      <span class="btn-content">[% acct.followers_count %]</span>
-                    </a>
-                  </td>
-                </tr>
-              </table>
-            </div>
-
-            <!-- Notifications -->
-            [% FOREACH notif IN notifs %]
-              [% notification_compact(ssn, data, notif) %]
-            [% END %]
-            
-            [% ELSE %]
-            <div class="sidebar-login">
-              <form action="$prefix/login" method="post">
-                <div class="form-group">
-                  <label for="login-username">[% lang('USERNAME') %]: </label>
-                  <input type="text" id="login-username" name="username">
-                </div>
-                <div class="form-group">
-                  <label for="login-password">[% lang('PASSWORD') %]: </label>
-                  <input type="password" id="login-password" name="password"><br>
-                </div>
-                <div class="form-group">
-                  <input class="btn" type="submit" value="[% lang('LOGIN_BTN') %]">
-                </div>
-              </form>
-            </div>
-            [% END %]
-          </td>
-        </tr>
-      </table>
-    </div>
-    
-    <!-- Source -->
-    <script src="$prefix/js/main.js"></script>
-    <script src="$prefix/js/emoji.js"></script>
-  </body>
+        
+        <!-- Source -->
+        <script src="$prefix/js/main.js"></script>
+        <script src="$prefix/js/emoji.js"></script>
+    </body>
 </html>

From 830a9c05b0b9c20b9d849f73e5be94f397ce0785 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 28 Jul 2022 05:15:13 +0000
Subject: [PATCH 017/143] Remove data dumper

FossilOrigin-Name: 478e33c595f64c9c18ee56bb54e7b69276efa32d55c4c1377cf5ca2c61af772d
---
 test/test.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/test.pl b/test/test.pl
index faf5cce..9a66bae 100755
--- a/test/test.pl
+++ b/test/test.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Data::Dumper;
 
 my $FAIL = "\033[91m";
 my $OK = "\033[96m";

From 97c81d08b7cbea5b76344e8e46577f21de325e56 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 28 Jul 2022 16:48:07 +0000
Subject: [PATCH 018/143] In reply to template:

FossilOrigin-Name: 7b0b3088bc82f0b7e4dc2bf9b4ffa00982ff6b18cd2e36f17a9b1eac50f040b3
---
 templates/status.tt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/status.tt b/templates/status.tt
index ae35aec..b5bf5b8 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -4,7 +4,7 @@
     <table class="status-table ui-table">
         <tr>
             <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
-                <img src="{{%s:avatar}}" loading="lazy">
+                <img src="[% status.account.avatar %]" loading="lazy">
             </td>
             <td class="status-info">
                 <div class="poster-stats">
@@ -50,7 +50,11 @@
                 </div>
                 <div class="status-data">
                     [%# Note: The id may actually (99.5% of the time) be the acct %]
-                    [% status.in_reply_to_id %]
+                    [% IF status.in_reply_to_id %]
+                        <span class="in-reply-to">
+                            <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> <span class="in-reply-to-text">In reply to</span> <span class="acct">[% status.in_reply_to_id %]</span></a>
+                        </span>
+                    [% END %]
                     <span class="status-content">
                         [% status.content %]
                     </span>

From a11470cfd7e9df13b4875b088c3ee0d4034e7468 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 29 Jul 2022 05:41:28 +0000
Subject: [PATCH 019/143] Status icons

FossilOrigin-Name: af3a2a07971fa9fbbf9d8c894e1bec8dbc2442b50894460e479077c7911ffe57
---
 perl/icons.pm              | 29 ++++++++++++++
 perl/status.pm             |  8 +++-
 src/global_perl.c          |  2 +
 src/status.c               |  2 +-
 static/reply_checkbox.tmpl |  5 ---
 templates/emoji_picker.tt  | 81 ++++++++++++++++++++++++++++++++++++++
 templates/status.tt        | 65 +++++++++++++++++++++++++++++-
 7 files changed, 182 insertions(+), 10 deletions(-)
 create mode 100644 perl/icons.pm
 create mode 100644 templates/emoji_picker.tt

diff --git a/perl/icons.pm b/perl/icons.pm
new file mode 100644
index 0000000..22404f7
--- /dev/null
+++ b/perl/icons.pm
@@ -0,0 +1,29 @@
+package icons;
+use strict;
+use warnings;
+
+use Exporter 'import';
+
+our @EXPORT = qw( &get_icon &get_icon_svg &get_icon_png );
+
+sub get_icon
+{
+    my ($ico, $is_png) = @_;
+    $is_png ||= 0;
+
+    $is_png ? get_icon_png($ico) : get_icon_svg($ico);
+}
+
+sub get_icon_svg
+{
+    my %res = (
+        repeat => '<svg class="repeat" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 2.1l4 4-4 4"/><path d="M3 12.2v-2a4 4 0 0 1 4-4h12.8M7 21.9l-4-4 4-4"/><path d="M21 11.8v2a4 4 0 0 1-4 4H4.2"/></svg>',
+        like => '<svg class="like" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>',
+        expand => '<svg class="expand" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h6v6M14 10l6.1-6.1M9 21H3v-6M10 14l-6.1 6.1"/></svg>',
+        reply => '<svg class="reply" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg>',
+        emoji => '<svg class="emoji-btn" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="10"/><g><line x1="9" x2="9" y1="6.9367" y2="11.755" stroke-width="1.7916"/><line x1="15" x2="15" y1="6.9367" y2="11.755" stroke-width="1.7916"/><path d="m7.0891 15.099s4.7206 4.7543 9.7109 0" stroke-linecap="round" stroke-linejoin="miter" stroke-width="1.9764"/></g></svg>',
+        likeboost => '<svg class="one-click-software" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><g stroke-width="1.98"><path d="m19.15 8.5061 2.7598 2.7598-2.7598 2.7598"/><path d="m14.756 11.325s2.5484-0.05032 6.3258 0.01026m-15.639 10.807-2.7598-2.7598 2.7598-2.7598"/><path d="m22.4 15.327v1.2259c0 1.156-1.2356 2.7598-2.7598 2.7598h-16.664"/></g><polygon transform="matrix(.60736 0 0 .60736 .60106 .63577)" points="18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2 15.09 8.26 22 9.27 17 14.14" stroke-width="2.9656"/></g></svg>',
+        );
+
+    $res{$_[0]};
+}
diff --git a/perl/status.pm b/perl/status.pm
index 232b621..05c6e8b 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,6 +1,7 @@
 package status;
 use strict;
 use warnings;
+use icons 'get_icon';
 use Exporter 'import';
 
 our @EXPORT = qw( status );
@@ -12,8 +13,10 @@ sub status
     my ($ssn, $data, $status) = @_;
 
     my %vars = (
-        prefix => $ssn,
-        status => $status
+        prefix => '',
+        ssn => $ssn,
+        status => $status,
+        icon => \&get_icon,
         );
 
     to_template(\%vars, \$data->{'status.tt'});
@@ -24,6 +27,7 @@ sub content_status
     my ($ssn, $data, $status, $statuses_before, $statuses_after) = @_;
 
     my %vars = (
+        prefix => '',
         ssn => $ssn,
         data => $data,
         create_status => \&status,
diff --git a/src/global_perl.c b/src/global_perl.c
index 0bae575..719f5fe 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -22,6 +22,7 @@
 #include "../templates/notif_compact.ctt"
 #include "../templates/status.ctt"
 #include "../templates/content_status.ctt"
+#include "../templates/emoji_picker.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -34,6 +35,7 @@ void init_template_files()
     hv_stores(template_files, "notif_compact.tt", newSVpv(data_notif_compact_tt, data_notif_compact_tt_size));
     hv_stores(template_files, "status.tt", newSVpv(data_status_tt, data_status_tt_size));
     hv_stores(template_files, "content_status.tt", newSVpv(data_content_status_tt, data_content_status_tt_size));
+    hv_stores(template_files, "emoji_picker.tt", newSVpv(data_emoji_picker_tt, data_emoji_picker_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/status.c b/src/status.c
index 58638be..aedb98f 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1122,7 +1122,7 @@ HV* perlify_status(const struct mstdnt_status* status)
     HV* status_hv = newHV();
     hvstores_str(status_hv, "id", status->id);
     hvstores_str(status_hv, "uri", status->uri);
-    hvstores_str(status_hv, "created_at", status->id);
+    hvstores_int(status_hv, "created_at", status->created_at);
     hvstores_ref(status_hv, "account", perlify_account(&(status->account)));
     hvstores_str(status_hv, "content", status->content);
     hvstores_str(status_hv, "spoiler_text", status->spoiler_text);
diff --git a/static/reply_checkbox.tmpl b/static/reply_checkbox.tmpl
index 080eb2d..e69de29 100644
--- a/static/reply_checkbox.tmpl
+++ b/static/reply_checkbox.tmpl
@@ -1,5 +0,0 @@
-        <label for="status-quickreply-{{%s:status_id}}" class="pointer statbtn reply-btn">
-            {{ %s : reply_btn }}
-            <span class="count">{{%s:reply_count}}</span>
-        </label>
-
diff --git a/templates/emoji_picker.tt b/templates/emoji_picker.tt
new file mode 100644
index 0000000..70cd38a
--- /dev/null
+++ b/templates/emoji_picker.tt
@@ -0,0 +1,81 @@
+<div class="emoji-picker">
+  <table class="tabs ui-table">
+    <tr>
+      <td>
+        <label for="cat-smileys">
+          <span class="tab-btn btn btn-alt">😃</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-animals">
+          <span class="tab-btn btn btn-alt">🐻</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-food">
+          <span class="tab-btn btn btn-alt">🍔</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-travel">
+          <span class="tab-btn btn btn-alt">🚀</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-activities">
+          <span class="tab-btn btn btn-alt">⚽</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-objects">
+          <span class="tab-btn btn btn-alt">🔧</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-symbols">
+          <span class="tab-btn btn btn-alt">🔢</span>
+        </label>
+      </td>
+      <td>
+        <label for="cat-flags">
+          <span class="tab-btn btn btn-alt">🎌</span>
+        </label>
+      </td>
+    </tr>
+  </table>
+
+  <div class="emoji-picker-emojos-wrapper">
+    <input type="radio" class="hidden" id="cat-smileys" name="emoji-cat" checked>
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_smileys}}
+    </div>
+    <input type="radio" class="hidden" id="cat-animals" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_animals}}
+    </div>
+    <input type="radio" class="hidden" id="cat-food" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_food}}
+    </div>
+    <input type="radio" class="hidden" id="cat-travel" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_travel}}
+    </div>
+    <input type="radio" class="hidden" id="cat-activities" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_activities}}
+    </div>
+    <input type="radio" class="hidden" id="cat-objects" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_objects}}
+    </div>
+    <input type="radio" class="hidden" id="cat-symbols" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_symbols}}
+    </div>
+    <input type="radio" class="hidden" id="cat-flags" name="emoji-cat">
+    <div class="emoji-picker-emojos">
+      {{%s:emojis_flags}}
+    </div>
+  </div>
+</div>
diff --git a/templates/status.tt b/templates/status.tt
index b5bf5b8..c96170f 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -9,7 +9,7 @@
             <td class="status-info">
                 <div class="poster-stats">
                     <span class="username">[% status.account.display_name %]</span>
-                    <a class="instance-info" href="$prefix/@{{%s:acct}}">[% status.account.acct %]</a>
+                    <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     <span class="alignend">
                         <div class="menu-container status-visibility">
                             {{%s:visibility}}
@@ -61,7 +61,68 @@
                     {{%s:attachments}}
                     {{%s:interactions}}
                     {{%s:emoji_reactions}}
-                    {{%s:interaction_btns}}
+                    <div class="status-interact">
+                        <table class="ui-table">
+                            <tr>
+                                <td>
+                                    <label for="status-quickreply-{{%s:status_id}}" class="pointer statbtn reply-btn">
+                                        [% icon('reply') %]
+                                        <span class="count">[% status.replies_count %]</span>
+                                    </label>
+
+
+                                </td>
+                                <td>
+                                    <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                        <input class="itype" type="hidden" name="itype" value="{{%s:unrepeat}}repeat">
+                                        <label class="repeat-btn pointer statbtn">
+                                            [% icon('repeat') %]
+                                            <span class="count">[% status.reblogs_count %]</span>
+                                            <input class="hidden" type="submit" value="Repeat">
+                                        </label>
+                                    </form>
+                                </td>
+                                <td>
+                                    <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                        <input class="itype" type="hidden" name="itype" value="{{%s:unfavourite}}like">
+                                        <label class="pointer statbtn like-btn">
+                                            [% icon('like') %]
+                                            <span class="count">[% status.favourites_count %]</span>
+                                            <input class="hidden" type="submit" value="Like">
+                                        </label>
+                                    </form>
+                                </td>
+                                [% IF ssn.config.stat_oneclicksoftware %]
+                                    <td>
+                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                            <input class="itype" type="hidden" name="itype" value="likeboost">
+                                            <label class="pointer statbtn likeboost-btn">
+                                                [% icon('likeboost') %]
+                                                
+                                                <input class="hidden" type="submit" value="L+R">
+                                            </label>
+                                        </form>
+                                    </td>
+                                [% END %]
+                                <td>
+                                    <a target="_parent" href="$prefix/status/[% status.id %]/react#[% status.id %]" class="pointer statbtn react-btn">
+                                        [% icon('emoji') %]
+                                    </a>
+                                    [% IF emoji_picker -%]
+                                        [% emoji_picker %]
+                                    [%- END %]
+                                </td>
+                                <td>
+                                    <a target="_parent" href="$prefix/status/[% status.id %]#[% status.id %]" class="pointer statbtn view-btn">
+                                        [% icon('expand') %]
+                                    </a>
+                                </td>
+                                <td>
+                                    <a href="#[% status.id %]" class="time">[% status.created_at %]</a>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
             </td>
         </tr>

From e19f1f854e525ae393d5a42cdd782d771f0784dd Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 29 Jul 2022 23:08:43 +0000
Subject: [PATCH 020/143] Visibility and CSS tweaks

FossilOrigin-Name: d45822206ba3c4bb2be994e4443a909f5c6d5896642703f11d901a2f5f1a37ab
---
 dist/treebird.css   |  26 ++++++----
 perl/icons.pm       |  38 +++++++++++++-
 perl/status.pm      |   3 +-
 src/status.c        | 121 +-------------------------------------------
 templates/status.tt |  14 +++--
 5 files changed, 66 insertions(+), 136 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 0d70b85..4237a53 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -815,9 +815,9 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 .status.focused,
 .status:target
 {
-    background-color: #ffdddd;
-    border-left: 3px solid #aa0000;
-    padding-left: 7px;
+    background: #ffdddd;
+    border-left: 2px solid #aa0000;
+    padding-left: 8px;
 }
 
 .notification-info + .status,
@@ -1034,10 +1034,17 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     cursor: pointer;
     color: #808080;
     display: inline;
-    font-size: 12px;
     margin-right: 5px;
 }
 
+.status-visibility .visibility
+{
+    stroke: #808080;
+    vertical-align: middle;
+    width: 17px;
+    height: 17px;
+}
+
 .status-interact
 {
     margin: 6px 0 0 0;
@@ -1461,7 +1468,7 @@ p}
 .status-interact .statbtn
 {
     display: block;
-    padding: 3px 2px 5px;
+    padding: 3px 0px 5px;
     min-width: 42px;
 }
 
@@ -1469,6 +1476,8 @@ p}
 {
     width: 18px;
     height: 18px;
+    stroke: #666;
+    vertical-align: middle;
 }
 
 .view-btn
@@ -1583,6 +1592,7 @@ p}
     padding-top: 3px;
     font-size: 12px;
     padding-bottom: 3px;
+    padding-right: 7px;
     vertical-align: middle;
 }
 
@@ -1635,12 +1645,6 @@ p}
     border: 1px solid #cacaca;
 }
 
-.emoji-btn
-{
-    position: relative;
-    top: 2px;
-}
-
 /* Emojo picker */
 .emoji-picker
 {
diff --git a/perl/icons.pm b/perl/icons.pm
index 22404f7..93e095e 100644
--- a/perl/icons.pm
+++ b/perl/icons.pm
@@ -4,7 +4,7 @@ use warnings;
 
 use Exporter 'import';
 
-our @EXPORT = qw( &get_icon &get_icon_svg &get_icon_png );
+our @EXPORT = qw( &get_icon &get_icon_svg &get_icon_png &visibility_to_icon );
 
 sub get_icon
 {
@@ -18,12 +18,48 @@ sub get_icon_svg
 {
     my %res = (
         repeat => '<svg class="repeat" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 2.1l4 4-4 4"/><path d="M3 12.2v-2a4 4 0 0 1 4-4h12.8M7 21.9l-4-4 4-4"/><path d="M21 11.8v2a4 4 0 0 1-4 4H4.2"/></svg>',
+        
         like => '<svg class="like" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>',
+        
         expand => '<svg class="expand" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h6v6M14 10l6.1-6.1M9 21H3v-6M10 14l-6.1 6.1"/></svg>',
+        
         reply => '<svg class="reply" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg>',
+        
         emoji => '<svg class="emoji-btn" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="10"/><g><line x1="9" x2="9" y1="6.9367" y2="11.755" stroke-width="1.7916"/><line x1="15" x2="15" y1="6.9367" y2="11.755" stroke-width="1.7916"/><path d="m7.0891 15.099s4.7206 4.7543 9.7109 0" stroke-linecap="round" stroke-linejoin="miter" stroke-width="1.9764"/></g></svg>',
+        
         likeboost => '<svg class="one-click-software" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><g stroke-width="1.98"><path d="m19.15 8.5061 2.7598 2.7598-2.7598 2.7598"/><path d="m14.756 11.325s2.5484-0.05032 6.3258 0.01026m-15.639 10.807-2.7598-2.7598 2.7598-2.7598"/><path d="m22.4 15.327v1.2259c0 1.156-1.2356 2.7598-2.7598 2.7598h-16.664"/></g><polygon transform="matrix(.60736 0 0 .60736 .60106 .63577)" points="18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2 15.09 8.26 22 9.27 17 14.14" stroke-width="2.9656"/></g></svg>',
+
+        fileclip => '<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48"></path></svg>',
+
+        'local' => '<svg class="visibility vis-local" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20 9v11a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V9"/><path d="M9 22V12h6v10M2 10.6L12 2l10 8.6"/></svg>',
+
+        direct => '<svg class="visibility vis-direct xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"></path><polyline points="22,6 12,13 2,6"></polyline></svg>',
+
+        private => '<svg class="visibility vis-private" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg>',
+
+        list => '<svg class="visibility vis-list" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"></line><line x1="8" y1="12" x2="21" y2="12"></line><line x1="8" y1="18" x2="21" y2="18"></line><line x1="3" y1="6" x2="3.01" y2="6"></line><line x1="3" y1="12" x2="3.01" y2="12"></line><line x1="3" y1="18" x2="3.01" y2="18"></line></svg>',
+
+        unlisted => '<svg class="visibility vis-unlisted" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 9.9-1"></path></svg>',
+
+        public => '<svg class="visibility vis-public" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>',
         );
 
     $res{$_[0]};
 }
+
+sub visibility_to_icon
+{
+    # I thought of an array, but I don't want to call get_icon UNLESS
+    # we know the visibility
+    my $vis = $_[0];
+
+    return get_icon('public') if $vis == 1;
+    return get_icon('unlisted') if $vis == 2;
+    return get_icon('private') if $vis == 3;
+    return get_icon('list') if $vis == 4;
+    return get_icon('direct') if $vis == 5;
+    return get_icon('local') if $vis == 6;
+    
+    # Assume local for anything else, because well... I'm not sure
+    get_icon('local');
+}
diff --git a/perl/status.pm b/perl/status.pm
index 05c6e8b..e205f5d 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,7 +1,7 @@
 package status;
 use strict;
 use warnings;
-use icons 'get_icon';
+use icons qw( get_icon visibility_to_icon );
 use Exporter 'import';
 
 our @EXPORT = qw( status );
@@ -17,6 +17,7 @@ sub status
         ssn => $ssn,
         status => $status,
         icon => \&get_icon,
+        vis_to_icon => \&visibility_to_icon,
         );
 
     to_template(\%vars, \$data->{'status.tt'});
diff --git a/src/status.c b/src/status.c
index aedb98f..f871266 100644
--- a/src/status.c
+++ b/src/status.c
@@ -265,124 +265,7 @@ char* construct_interaction_buttons(struct session* ssn,
                                     size_t* size,
                                     uint8_t flags)
 {
-    int use_img = ssn->config.interact_img;
-    char* interaction_html;
-    char* repeat_btn;
-    char* like_btn;
-    char* likeboost_html = NULL;
-    char* reply_count = NULL;
-    char* repeat_count = NULL;
-    char* reply_btn;
-    char* favourites_count = NULL;
-    char* emoji_picker_html = NULL;
-    char* reactions_btn_html = NULL;
-    char* time_str;
-    int show_nums = (flags & STATUS_NO_DOPAMEME) != STATUS_NO_DOPAMEME &&
-        ssn->config.stat_dope;
-    size_t s;
-
-    // Emojo picker
-    if ((flags & STATUS_EMOJI_PICKER) == STATUS_EMOJI_PICKER)
-    {
-        emoji_picker_html = construct_emoji_picker(status->id, NULL);
-    }
-
-    struct reactions_btn_template tdata = {
-        .prefix = config_url_prefix,
-        .status_id = status->id,
-        .emoji_picker = emoji_picker_html
-    };
-    reactions_btn_html = tmpl_gen_reactions_btn(&tdata, NULL);
-
-    if (show_nums)
-    {
-        if (status->replies_count)
-            easprintf(&reply_count, NUM_STR, status->replies_count);
-        if (status->reblogs_count)
-            easprintf(&repeat_count, NUM_STR, status->reblogs_count);
-        if (status->favourites_count)
-            easprintf(&favourites_count, NUM_STR, status->favourites_count);
-    }
-
-    struct likeboost_template lbdata = {
-        .prefix = config_url_prefix,
-        .status_id = status->id,
-    };
-    likeboost_html = tmpl_gen_likeboost(&lbdata, NULL);
-    
-    time_str = reltime_to_str(status->created_at);
-
-    // TODO cleanup?
-    if (use_img)
-    {
-        struct repeat_btn_img_template rpbdata = { .prefix = config_url_prefix, .repeat_active = status->reblogged ? "active" : "" };
-        repeat_btn = tmpl_gen_repeat_btn_img(&rpbdata, NULL);
-        struct like_btn_img_template ldata = { .prefix = config_url_prefix, .favourite_active = status->favourited ? "active" : "" };
-        like_btn = tmpl_gen_like_btn_img(&ldata, NULL);
-    }
-    else {
-        struct repeat_btn_template rpbdata = { .repeat_active = status->reblogged ? "active" : "" };
-        repeat_btn = tmpl_gen_repeat_btn(&rpbdata, NULL);
-        struct like_btn_template ldata = { .favourite_active = status->favourited ? "active" : "" };
-        like_btn = tmpl_gen_like_btn(&ldata, NULL);
-    }
-    
-    // Weather it should be a link or a <label> button
-    if ((flags & STATUS_NO_QUICKREPLY) != STATUS_NO_QUICKREPLY)
-    {
-        struct reply_checkbox_template tmpl = {
-            .reply_btn = use_img ? data_reply_btn_img : data_reply_btn,
-            .reply_count = reply_count,
-            .status_id = status->id,
-        };
-        reply_btn = tmpl_gen_reply_checkbox(&tmpl, NULL);
-    }
-    else {
-        struct reply_link_template tmpl = {
-            .prefix = config_url_prefix,
-            .reply_btn = use_img ? data_reply_btn_img : data_reply_btn,
-            .reply_count = reply_count,
-            .status_id = status->id,
-        };
-        reply_btn = tmpl_gen_reply_link(&tmpl, NULL);        
-    }
-
-    struct interaction_buttons_template data = {
-        // Icons
-        .reply_btn = reply_btn,
-        .expand_btn = use_img ? data_expand_btn_img : data_expand_btn,
-        .repeat_btn = repeat_btn,
-        .like_btn = like_btn,
-        // Interactions data
-        .prefix = config_url_prefix,
-        .status_id = status->id,
-        .unrepeat = status->reblogged ? "un" : "",
-        .repeats_count = repeat_count,
-        .repeat_text = "Repeat",
-        .unfavourite = status->favourited ? "un" : "",
-        .favourites_count = favourites_count,
-        .favourites_text = "Favorite",
-        .likeboost_btn = (likeboost_html &&
-                          ssn->config.stat_oneclicksoftware &&
-                          (flags & STATUS_NO_LIKEBOOST) != STATUS_NO_LIKEBOOST ? likeboost_html : ""),
-        .reactions_btn = reactions_btn_html,
-        .rel_time = time_str
-    };
-
-    interaction_html = tmpl_gen_interaction_buttons(&data, size);
-    
-    // Cleanup
-    free(emoji_picker_html);
-    free(reply_count);
-    free(repeat_count);
-    free(favourites_count);
-    free(reactions_btn_html);
-    free(likeboost_html);
-    free(time_str);
-    free(reply_btn);
-    free(like_btn);
-    free(repeat_btn);
-    return interaction_html;
+    return "";
 }
 
 char* construct_status_interactions(char* status_id,
@@ -875,7 +758,6 @@ char* construct_status(struct session* ssn,
         free(formatted_display_name);
     if (serialized_display_name != status->account.display_name)
         free(serialized_display_name);
-    free(interaction_btns);
     free(in_reply_to_str);
     free(attachments);
     free(post_response);
@@ -1137,6 +1019,7 @@ HV* perlify_status(const struct mstdnt_status* status)
     hvstores_int(status_hv, "muted", status->muted);
     hvstores_int(status_hv, "bookmarked", status->bookmarked);
     hvstores_int(status_hv, "pinned", status->pinned);
+    hvstores_int(status_hv, "visibility", ((int)(status->visibility)));
     hvstores_int(status_hv, "reblogs_count", status->reblogs_count);
     hvstores_int(status_hv, "favourites_count", status->favourites_count);
     hvstores_int(status_hv, "replies_count", status->replies_count);
diff --git a/templates/status.tt b/templates/status.tt
index c96170f..3965d88 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -12,7 +12,7 @@
                     <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     <span class="alignend">
                         <div class="menu-container status-visibility">
-                            {{%s:visibility}}
+                            [% vis_to_icon(status.visibility) %]
                             <div class="menu">
                                 <ul>
                                     <li>
@@ -67,7 +67,9 @@
                                 <td>
                                     <label for="status-quickreply-{{%s:status_id}}" class="pointer statbtn reply-btn">
                                         [% icon('reply') %]
-                                        <span class="count">[% status.replies_count %]</span>
+                                        [% IF status.replies_count %]
+                                            <span class="count">[% status.replies_count %]</span>
+                                        [% END %]
                                     </label>
 
 
@@ -77,7 +79,9 @@
                                         <input class="itype" type="hidden" name="itype" value="{{%s:unrepeat}}repeat">
                                         <label class="repeat-btn pointer statbtn">
                                             [% icon('repeat') %]
-                                            <span class="count">[% status.reblogs_count %]</span>
+                                            [% IF status.reblogs_count %]
+                                                <span class="count">[% status.reblogs_count %]</span>
+                                            [% END %]
                                             <input class="hidden" type="submit" value="Repeat">
                                         </label>
                                     </form>
@@ -87,7 +91,9 @@
                                         <input class="itype" type="hidden" name="itype" value="{{%s:unfavourite}}like">
                                         <label class="pointer statbtn like-btn">
                                             [% icon('like') %]
-                                            <span class="count">[% status.favourites_count %]</span>
+                                            [% IF status.favourites_count %]
+                                                <span class="count">[% status.favourites_count %]</span>
+                                            [% END %]
                                             <input class="hidden" type="submit" value="Like">
                                         </label>
                                     </form>

From d46209f0ee4135276f90af9f691875a68f09f305 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 30 Jul 2022 03:51:30 +0000
Subject: [PATCH 021/143] Relative time perl, emojis and attachment funcs

FossilOrigin-Name: 7a290aefc9a21f9789cb097ff99c1423fbf67a399f916ab2232e6eab7e83b460
---
 perl/status.pm         |  2 ++
 perl/string_helpers.pm | 19 +++++++++++++++++++
 src/attachments.c      | 29 +++++++++++++++++++++++++++++
 src/attachments.h      |  5 +++++
 src/emoji.c            | 28 ++++++++++++++++++++++++++++
 src/emoji.h            |  5 +++++
 templates/status.tt    |  6 +++---
 7 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 perl/string_helpers.pm

diff --git a/perl/status.pm b/perl/status.pm
index e205f5d..a07bec6 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,6 +1,7 @@
 package status;
 use strict;
 use warnings;
+use string_helpers qw( reltime_to_str );
 use icons qw( get_icon visibility_to_icon );
 use Exporter 'import';
 
@@ -17,6 +18,7 @@ sub status
         ssn => $ssn,
         status => $status,
         icon => \&get_icon,
+        rel_to_str => \&reltime_to_str,
         vis_to_icon => \&visibility_to_icon,
         );
 
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
new file mode 100644
index 0000000..8dff450
--- /dev/null
+++ b/perl/string_helpers.pm
@@ -0,0 +1,19 @@
+package string_helpers;
+use strict;
+use warnings;
+
+use Exporter 'import';
+
+our @EXPORT = qw( &reltime_to_str );
+
+sub reltime_to_str
+{
+    my $since = time() - $_[0];
+
+    return $since . 's' if $since < 60;
+    return int($since / 60) . 'm' if $since < 60 * 60;
+    return int($since / (60 * 60)) . 'h' if $since < 60 * 60 * 24;
+    return int($since / (60 * 60 * 24)) . 'd' if $since < 60 * 60 * 24 * 31;
+    return int($since / (60 * 60 * 24 * 31)) . 'mon' if $since < 60 * 60 * 24 * 365;
+    return int($since / (60 * 60 * 24 * 365)) . 'yr';
+}
diff --git a/src/attachments.c b/src/attachments.c
index 6b7ce2d..1ad97e3 100644
--- a/src/attachments.c
+++ b/src/attachments.c
@@ -197,6 +197,35 @@ char* construct_attachments(struct session* ssn,
     return att_view;
 }
 
+HV* perlify_attachment(struct mstdnt_attachment* const attachment)
+{
+    if (!attachments) return NULL;
+    HV* attach_hv = newHV();
+    hvstores_str(attach_hv, "id", attachment->id);
+    hvstores_int(attach_hv, "type", attachment->type)
+    hvstores_str(attach_hv, "url", attachment->url);
+    hvstores_str(attach_hv, "preview_url", attachment->preview_url);
+    hvstores_str(attach_hv, "remote_url", attachment->remote_url);
+    hvstores_str(attach_hv, "hash", attachment->hash);
+    hvstores_str(attach_hv, "description", attachment->description);
+    hvstores_str(attach_hv, "blurhash", attachment->blurhash);
+    return attach_hv;
+}
+
+AV* perlify_attachments(struct mstdnt_attachment* const attachments, size_t len)
+{
+    if (!(attachments && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_attachment(attachments + i)));
+    }
+
+    return av;
+}
+
 void api_attachment_create(PATH_ARGS)
 {
     struct mstdnt_storage *att_storage = NULL;
diff --git a/src/attachments.h b/src/attachments.h
index 9e54e2c..21e5100 100644
--- a/src/attachments.h
+++ b/src/attachments.h
@@ -21,6 +21,7 @@
 #include <mastodont.h>
 #include "path.h"
 #include "session.h"
+#include "global_perl.h"
 
 #define FILES_READY(ssn) (ssn->post.files.type.f.array_size &&          \
                           ssn->post.files.type.f.content &&             \
@@ -37,4 +38,8 @@ char* construct_attachment(struct session* ssn, mstdnt_bool sensitive, struct ms
 char* construct_attachments(struct session* ssn, mstdnt_bool sensitive, struct mstdnt_attachment* atts, size_t atts_len, size_t* str_size);
 void api_attachment_create(PATH_ARGS);
 
+// Perl
+HV* perlify_attachment(struct mstdnt_attachment* const attachment);
+AV* perlify_attachments(struct mstdnt_attachment* const attachments, size_t len);
+
 #endif // ATTACHMENTS_H
diff --git a/src/emoji.c b/src/emoji.c
index f26ce37..e60a9ad 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -163,3 +163,31 @@ char* construct_emoji_picker(char* status_id, size_t* size)
         free(emojis[i]);
     return emoji_picker_html;
 }
+
+HV* perlify_emoji(struct mstdnt_emoji* const emoji);
+{
+    if (!emoji) return NULL;
+    HV* emoji_hv = newHV();
+    hvstores_str(emoji_hv, "shortcode", attachment->id);
+    hvstores_str(emoji_hv, "url", attachment->url);
+    hvstores_str(emoji_hv, "static_url", attachment->preview_url);
+    hvstores_str(emoji_hv, "visible_in_picker", attachment->visible_in_picker);
+    hvstores_str(emoji_hv, "hash", attachment->hash);
+    hvstores_str(emoji_hv, "description", attachment->description);
+    hvstores_str(emoji_hv, "blurhash", attachment->blurhash);
+    return emoji_hv;
+}
+
+AV* perlify_emojis(struct mstdnt_emoji* const emos, size_t len)
+{
+    if (!(emos && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_emoji(emos + i)));
+    }
+
+    return av;
+}
diff --git a/src/emoji.h b/src/emoji.h
index 3968009..67b624b 100644
--- a/src/emoji.h
+++ b/src/emoji.h
@@ -21,6 +21,7 @@
 #include <stddef.h>
 #include <mastodont.h>
 #include "emoji_codes.h"
+#include "global_perl.h"
 
 #define EMOJI_FACTOR_NUM 32
 
@@ -36,4 +37,8 @@ char* construct_emoji(struct emoji_info* emoji, char* status_id, size_t* size);
 void content_emoji_picker(PATH_ARGS);
 char* construct_emoji_picker(char* status_id, size_t* size);
 
+// Perl
+HV* perlify_emoji(struct mstdnt_emoji* const emoji);
+AV* perlify_emojis(struct mstdnt_emoji* const emos, size_t len);
+
 #endif // EMOJI_H
diff --git a/templates/status.tt b/templates/status.tt
index 3965d88..1c57a5c 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -71,8 +71,6 @@
                                             <span class="count">[% status.replies_count %]</span>
                                         [% END %]
                                     </label>
-
-
                                 </td>
                                 <td>
                                     <form action="$prefix/status/[% status.id %]/interact" method="post">
@@ -124,7 +122,9 @@
                                     </a>
                                 </td>
                                 <td>
-                                    <a href="#[% status.id %]" class="time">[% status.created_at %]</a>
+                                    <a href="#[% status.id %]" class="time">
+                                        [%- rel_to_str(status.created_at) -%]
+                                    </a>
                                 </td>
                             </tr>
                         </table>

From 025036832a9b717e89e85a60a966d229edcae651 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 30 Jul 2022 06:19:17 +0000
Subject: [PATCH 022/143] Attachments, Emoji reactions, reply id's

FossilOrigin-Name: 58d7a2add5fc05eac12f8bacd7071095d91d0c9d3f481454202898b1cf5c115a
---
 perl/attachments.pm     | 23 +++++++++++++++++++++++
 perl/emojis.pm          | 24 ++++++++++++++++++++++++
 perl/main.pl            |  6 +++---
 perl/notifications.pm   |  7 ++++---
 perl/status.pm          | 11 ++++++++---
 src/attachments.c       |  4 ++--
 src/emoji.c             | 14 ++++++--------
 src/emoji_reaction.c    | 25 +++++++++++++++++++++++++
 src/emoji_reaction.h    |  5 +++++
 src/global_perl.c       |  4 ++++
 src/login.c             |  2 +-
 src/status.c            | 24 ++++++++++++++++++++++++
 src/status.h            |  1 +
 static/post.tmpl        |  2 +-
 templates/attachment.tt | 30 ++++++++++++++++++++++++++++++
 templates/emoji.tt      |  8 ++++++++
 templates/status.tt     | 22 +++++++++++++++++-----
 17 files changed, 186 insertions(+), 26 deletions(-)
 create mode 100644 perl/attachments.pm
 create mode 100644 perl/emojis.pm
 create mode 100644 templates/attachment.tt
 create mode 100644 templates/emoji.tt

diff --git a/perl/attachments.pm b/perl/attachments.pm
new file mode 100644
index 0000000..6712fce
--- /dev/null
+++ b/perl/attachments.pm
@@ -0,0 +1,23 @@
+package attachments;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORT = qw( generate_attachment );
+
+use template_helpers 'to_template';
+
+sub generate_attachment
+{
+    my ($ssn, $data, $att, $sensitive) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        attachment => $att,
+        sensitive => $sensitive
+        );
+
+    to_template(\%vars, \$data->{'attachment.tt'});
+}
+
diff --git a/perl/emojis.pm b/perl/emojis.pm
new file mode 100644
index 0000000..861ccea
--- /dev/null
+++ b/perl/emojis.pm
@@ -0,0 +1,24 @@
+package emojis;
+use strict;
+use warnings;
+use Data::Dumper;
+use Exporter 'import';
+
+our @EXPORT = qw( generate_emoji );
+
+use template_helpers 'to_template';
+
+sub generate_emoji
+{
+    my ($ssn, $data, $status_id, $emoji) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        status_id => $status_id,
+        emoji => $emoji
+        );
+
+    to_template(\%vars, \$data->{'emoji.tt'});
+}
+
diff --git a/perl/main.pl b/perl/main.pl
index e7e6b7c..0f01c9e 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -3,9 +3,9 @@ use warnings;
 # Modules
 use Template;
 use l10n qw( &lang %L10N );
-use notifications qw( notification_compact );
+use notifications qw( generate_notification_compact );
 use template_helpers qw( &to_template );
-use status ();
+use status;
 
 # my $template = Template->new(
 #     {
@@ -33,7 +33,7 @@ sub base_page
         acct => $ssn->{account},
         data => $data,
         notifs => $notifs,
-        notification_compact => \&notification_compact,
+        notification_compact => \&generate_notification_compact,
         );
 
     to_template(\%vars, \$data->{'main.tt'});
diff --git a/perl/notifications.pm b/perl/notifications.pm
index c97377a..322ced7 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -3,16 +3,17 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( notification_compact );
+our @EXPORT = qw( generate_notification_compact );
 
 use template_helpers 'to_template';
 
-sub notification_compact
+sub generate_notification_compact
 {
     my ($ssn, $data, $notif) = @_;
 
     my %vars = (
-        prefix => $ssn,
+        prefix => '',
+        ssn => $ssn,
         notif => $notif
         );
 
diff --git a/perl/status.pm b/perl/status.pm
index a07bec6..4faabd7 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -3,13 +3,15 @@ use strict;
 use warnings;
 use string_helpers qw( reltime_to_str );
 use icons qw( get_icon visibility_to_icon );
+use attachments 'generate_attachment';
+use emojis 'generate_emoji';
 use Exporter 'import';
 
-our @EXPORT = qw( status );
+our @EXPORT = qw( content_status generate_status );
 
 use template_helpers 'to_template';
 
-sub status
+sub generate_status
 {
     my ($ssn, $data, $status) = @_;
 
@@ -33,10 +35,13 @@ sub content_status
         prefix => '',
         ssn => $ssn,
         data => $data,
-        create_status => \&status,
         status => $status,
         statuses_before => $statuses_before,
         statuses_after => $statuses_after,
+        # Functions
+        create_status => \&generate_status,
+        make_att => \&generate_attachment,
+        make_emoji => \&generate_emoji,
         );
 
 
diff --git a/src/attachments.c b/src/attachments.c
index 1ad97e3..953308b 100644
--- a/src/attachments.c
+++ b/src/attachments.c
@@ -199,10 +199,10 @@ char* construct_attachments(struct session* ssn,
 
 HV* perlify_attachment(struct mstdnt_attachment* const attachment)
 {
-    if (!attachments) return NULL;
+    if (!attachment) return NULL;
     HV* attach_hv = newHV();
     hvstores_str(attach_hv, "id", attachment->id);
-    hvstores_int(attach_hv, "type", attachment->type)
+    hvstores_int(attach_hv, "type", attachment->type);
     hvstores_str(attach_hv, "url", attachment->url);
     hvstores_str(attach_hv, "preview_url", attachment->preview_url);
     hvstores_str(attach_hv, "remote_url", attachment->remote_url);
diff --git a/src/emoji.c b/src/emoji.c
index e60a9ad..0f309af 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -164,17 +164,15 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     return emoji_picker_html;
 }
 
-HV* perlify_emoji(struct mstdnt_emoji* const emoji);
+HV* perlify_emoji(struct mstdnt_emoji* const emoji)
 {
     if (!emoji) return NULL;
     HV* emoji_hv = newHV();
-    hvstores_str(emoji_hv, "shortcode", attachment->id);
-    hvstores_str(emoji_hv, "url", attachment->url);
-    hvstores_str(emoji_hv, "static_url", attachment->preview_url);
-    hvstores_str(emoji_hv, "visible_in_picker", attachment->visible_in_picker);
-    hvstores_str(emoji_hv, "hash", attachment->hash);
-    hvstores_str(emoji_hv, "description", attachment->description);
-    hvstores_str(emoji_hv, "blurhash", attachment->blurhash);
+    hvstores_str(emoji_hv, "shortcode", emoji->shortcode);
+    hvstores_str(emoji_hv, "url", emoji->url);
+    hvstores_str(emoji_hv, "static_url", emoji->static_url);
+    hvstores_str(emoji_hv, "visible_in_picker", emoji->visible_in_picker);
+    hvstores_str(emoji_hv, "category", emoji->category);
     return emoji_hv;
 }
 
diff --git a/src/emoji_reaction.c b/src/emoji_reaction.c
index 2720941..7e6bf65 100644
--- a/src/emoji_reaction.c
+++ b/src/emoji_reaction.c
@@ -86,3 +86,28 @@ char* construct_emoji_reactions(char* id, struct mstdnt_emoji_reaction* emos, si
     return emos_view;
 }
 
+HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji)
+{
+    if (!emoji) return NULL;
+    HV* emoji_hv = newHV();
+    hvstores_str(emoji_hv, "name", emoji->name);
+    hvstores_str(emoji_hv, "url", emoji->url);
+    hvstores_str(emoji_hv, "static_url", emoji->static_url);
+    hvstores_int(emoji_hv, "count", emoji->count);
+    hvstores_int(emoji_hv, "me", emoji->me);
+    return emoji_hv;
+}
+
+AV* perlify_emoji_reactions(struct mstdnt_emoji_reaction* const emos, size_t len)
+{
+    if (!(emos && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_emoji_reaction(emos + i)));
+    }
+
+    return av;
+}
diff --git a/src/emoji_reaction.h b/src/emoji_reaction.h
index bab23ae..bd7f12c 100644
--- a/src/emoji_reaction.h
+++ b/src/emoji_reaction.h
@@ -19,8 +19,13 @@
 #ifndef EMOJI_REACTION_H
 #define EMOJI_REACTION_H
 #include <mastodont.h>
+#include "global_perl.h"
 
 char* construct_emoji_reaction(char* id, struct mstdnt_emoji_reaction* emo, size_t* str_len);
 char* construct_emoji_reactions(char* id, struct mstdnt_emoji_reaction* emos, size_t emos_len, size_t* str_len);
 
+// Perl
+HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji);
+AV* perlify_emoji_reactions(struct mstdnt_emoji_reaction* const emos, size_t len);
+
 #endif // EMOJI_REACTION_H
diff --git a/src/global_perl.c b/src/global_perl.c
index 719f5fe..02093ce 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -23,6 +23,8 @@
 #include "../templates/status.ctt"
 #include "../templates/content_status.ctt"
 #include "../templates/emoji_picker.ctt"
+#include "../templates/attachment.ctt"
+#include "../templates/emoji.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -36,6 +38,8 @@ void init_template_files()
     hv_stores(template_files, "status.tt", newSVpv(data_status_tt, data_status_tt_size));
     hv_stores(template_files, "content_status.tt", newSVpv(data_content_status_tt, data_content_status_tt_size));
     hv_stores(template_files, "emoji_picker.tt", newSVpv(data_emoji_picker_tt, data_emoji_picker_tt_size));
+    hv_stores(template_files, "attachment.tt", newSVpv(data_attachment_tt, data_attachment_tt_size));
+    hv_stores(template_files, "emoji.tt", newSVpv(data_emoji_tt, data_emoji_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/login.c b/src/login.c
index b8904db..c5e1654 100644
--- a/src/login.c
+++ b/src/login.c
@@ -84,7 +84,7 @@ void content_login_oauth(PATH_ARGS)
         m_args.url = decode_url;
         
         struct mstdnt_application_args args_app = {
-            .client_name = "Treebird",
+            .client_name = "DESU",
             .redirect_uris = urlify_redirect_url,
             .scopes = "read+write+follow+push",
             .website = keystr(ssn->post.instance)
diff --git a/src/status.c b/src/status.c
index f871266..8b1c06f 100644
--- a/src/status.c
+++ b/src/status.c
@@ -997,6 +997,24 @@ void notice_redirect(PATH_ARGS)
     free(url);
 }
 
+HV* perlify_status_pleroma(const struct mstdnt_status_pleroma* pleroma)
+{
+    if (!pleroma) return NULL;
+    
+    HV* pleroma_hv = newHV();
+    hvstores_int(pleroma_hv, "conversation_id", pleroma->conversation_id);
+    hvstores_int(pleroma_hv, "direct_conversation_id", pleroma->direct_conversation_id);
+    hvstores_int(pleroma_hv, "thread_muted", pleroma->thread_muted);
+    hvstores_int(pleroma_hv, "local", pleroma->local);
+    hvstores_int(pleroma_hv, "parent_visible", pleroma->parent_visible);
+    hvstores_ref(pleroma_hv, "emoji_reactions",
+                 perlify_emoji_reactions(pleroma->emoji_reactions, pleroma->emoji_reactions_len));
+    hvstores_str(pleroma_hv, "expires_at", pleroma->expires_at);
+    hvstores_str(pleroma_hv, "in_reply_to_account_acct", pleroma->in_reply_to_account_acct);
+
+    return pleroma_hv;
+}
+
 HV* perlify_status(const struct mstdnt_status* status)
 {
     if (!status) return NULL;
@@ -1019,11 +1037,17 @@ HV* perlify_status(const struct mstdnt_status* status)
     hvstores_int(status_hv, "muted", status->muted);
     hvstores_int(status_hv, "bookmarked", status->bookmarked);
     hvstores_int(status_hv, "pinned", status->pinned);
+
+    hvstores_int(status_hv, "sensitive", status->sensitive);
     hvstores_int(status_hv, "visibility", ((int)(status->visibility)));
     hvstores_int(status_hv, "reblogs_count", status->reblogs_count);
     hvstores_int(status_hv, "favourites_count", status->favourites_count);
     hvstores_int(status_hv, "replies_count", status->replies_count);
     hvstores_ref(status_hv, "status", perlify_status(status->reblog));
+    hvstores_ref(status_hv, "media_attachments",
+                 perlify_attachments(status->media_attachments, status->media_attachments_len));
+    hvstores_ref(status_hv, "emojis", perlify_emojis(status->emojis, status->emojis_len));
+    hvstores_ref(status_hv, "pleroma", perlify_status_pleroma(&(status->pleroma)));
 
     return status_hv;
 }
diff --git a/src/status.h b/src/status.h
index 7a3c36c..812af79 100644
--- a/src/status.h
+++ b/src/status.h
@@ -136,6 +136,7 @@ void notice_redirect(PATH_ARGS);
 void api_status_interact(PATH_ARGS);
 
 // Perl
+HV* perlify_status_pleroma(const struct mstdnt_status_pleroma* pleroma);
 HV* perlify_status(const struct mstdnt_status* status);
 AV* perlify_statuses(const struct mstdnt_status* statuses, size_t len); 
 
diff --git a/static/post.tmpl b/static/post.tmpl
index 8e492b0..b05c7e2 100644
--- a/static/post.tmpl
+++ b/static/post.tmpl
@@ -28,7 +28,7 @@
           <label>
             <input type="radio" name="visibility" value="direct" class="hidden" {{ %s : direct_checked }}>
             <div class="visibility-icon vis-direct">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"></path><polyline points="22,6 12,13 2,6"></polyline></svg>
+                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"></path><polyline points="22,6 12,13 2,6"></polyline></svg>
             </div>
           </label>
           <!-- Private -->
diff --git a/templates/attachment.tt b/templates/attachment.tt
new file mode 100644
index 0000000..31359c5
--- /dev/null
+++ b/templates/attachment.tt
@@ -0,0 +1,30 @@
+<div class="attachment-container 
+    [%- IF attachment.type == 1 -%]        [%# Image attachment %]
+            attachment-img">
+        <img width="256" src="[% attachment.url %]" loading="lazy">
+    [%- ELSIF attachment.type == 2 -%]        [%# Gifv attachment (mastodon) %]
+        attachment-gifv">
+        <video width="256" autoplay muted loop>
+            <source src="[% attachment.url %]">
+            [ GIFV ]
+        </video>
+    [%- ELSIF attachment.type == 3 -%]        [%# video attachment %]
+        attachment-video">
+        <video width="256" controls preload="metadata">
+            <source src="[% attachment.url %]">
+            [ VIDEO ]
+        </video>
+    [%- ELSIF attachment.type == 4 -%]        [%# Audio attachment %]
+        attachment-audio">
+        <audio width="256" controls preload="metadata">
+            <source src="[% attachment.url %]">
+        </audio>
+    [%- ELSE -%]        [%# Unknown attachment - Link %]
+        attachment-link [% IF sensitive %]sensitive[% END %]">
+        <a href="[% attachment.url %]">Attachment</a>
+    [%- END -%]
+
+    [% IF sensitive && attachment.type != 0 %]       [%# Link %]
+        <div class="sensitive-contain sensitive"></div>
+    [% END %]
+</div>
diff --git a/templates/emoji.tt b/templates/emoji.tt
new file mode 100644
index 0000000..c3f8639
--- /dev/null
+++ b/templates/emoji.tt
@@ -0,0 +1,8 @@
+[%# So.. sometimes Pleroma just shows a `0` emoji count, I suppose when an instance gets blocked or the user deletes their account.
+   I'm not sure, but we should check if the emoji count is more than zero (as a workaround) or else it display's `0` %]
+[% IF emoji.count > 0 %]
+    <a href="$prefix/status/[% status_id %]/react/[% emoji.name %]" class="emoji-react-box [% IF emoji.url %]custom-emoji-container[% END %] btn btn-alt [% IF emoji.me %]active[% END %]">
+        <span class="emoji">[%- IF emoji.url -%]<img src="[% emoji.url %]" class="custom-emoji-react">[%- ELSE -%][%- emoji.name -%][%- END -%]</span>
+        <span class="emoji-num">[% emoji.count %]</span>
+    </a>
+[% END %]
diff --git a/templates/status.tt b/templates/status.tt
index 1c57a5c..00f30f9 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -52,20 +52,32 @@
                     [%# Note: The id may actually (99.5% of the time) be the acct %]
                     [% IF status.in_reply_to_id %]
                         <span class="in-reply-to">
-                            <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> <span class="in-reply-to-text">In reply to</span> <span class="acct">[% status.in_reply_to_id %]</span></a>
+                            <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> <span class="in-reply-to-text">In reply to</span> <span class="acct">[% status.pleroma.in_reply_to_account_acct || status.in_reply_to_account_id %]</span></a>
                         </span>
                     [% END %]
                     <span class="status-content">
                         [% status.content %]
                     </span>
-                    {{%s:attachments}}
-                    {{%s:interactions}}
-                    {{%s:emoji_reactions}}
+                    [% IF status.media_attachments %]
+                        <div class="attachments">
+                            [% FOR att IN status.media_attachments %]
+                                [% make_att(ssn, data, att, status.sensitive) %]
+                            [% END %]
+                        </div>
+                    [% END %]
+                    [%# TODO {{%s:interactions}} %]
+                    [% IF status.pleroma.emoji_reactions %]
+                        <div class="emoji-reactions">
+                        [% FOR emo IN status.pleroma.emoji_reactions %]
+                            [% make_emoji(ssn, data, status.id, emo) %]
+                        [% END %]
+                        </div>
+                    [% END %]
                     <div class="status-interact">
                         <table class="ui-table">
                             <tr>
                                 <td>
-                                    <label for="status-quickreply-{{%s:status_id}}" class="pointer statbtn reply-btn">
+                                    <label for="status-quickreply-[% status.id %]" class="pointer statbtn reply-btn">
                                         [% icon('reply') %]
                                         [% IF status.replies_count %]
                                             <span class="count">[% status.replies_count %]</span>

From 849b63640c486e002ec51a389536624749d71476 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 30 Jul 2022 22:37:07 +0000
Subject: [PATCH 023/143] fds

FossilOrigin-Name: fe992d7bba6c2918cf35dc1886579b325eb2b4cb1448cd05ef6a32fc20f6acff
---
 dist/treebird.css   |  97 ++++++++++++++++++++++++++--------
 src/applications.c  |  36 +++++++++++++
 src/applications.h  |  26 ++++++++++
 src/status.c        |   2 +
 templates/status.tt | 124 +++++++++++++++++++++-----------------------
 5 files changed, 196 insertions(+), 89 deletions(-)
 create mode 100644 src/applications.c
 create mode 100644 src/applications.h

diff --git a/dist/treebird.css b/dist/treebird.css
index 4237a53..4e07b0f 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -526,6 +526,7 @@ input[type=range]::-moz-range-thumb
 .btn-alt:hover
 {
     background: linear-gradient(#aa0000, #ee0000);
+    border-color: #800000;
 }
 
 .btn-disabled
@@ -795,7 +796,8 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
  **************************/
 .status
 {
-    padding: 11px 0px 0px 11px;
+    padding: 11px;
+    padding-bottom: 6px;
     border-bottom: 1px dashed #cacaca;
 }
 
@@ -817,7 +819,7 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 {
     background: #ffdddd;
     border-left: 2px solid #aa0000;
-    padding-left: 8px;
+    padding-left: 9px;
 }
 
 .notification-info + .status,
@@ -910,7 +912,6 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     font-size: 10px;
 }
 
-.status .time:before,
 .notification-compact .time:before
 {
     content: "•";
@@ -918,13 +919,42 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     font-size: 10px;
 }
 
+.status .time
+{
+    margin-right: 4px;
+    vertical-align: middle;
+}
+
+.status .status-meta
+{
+    vertical-align: middle;
+}
+
+.status .application-name
+{
+    display: inline-block;
+    margin-left: 4px;
+    max-width: 140px;
+    vertical-align: middle;
+    overflow: hidden;
+    white-space: nowrap;
+    font-size: 13px;
+    text-overflow: ellipsis;
+}
+
+.status .application-name:before
+{
+    content: "•";
+    padding-right: 10px;
+    font-size: 12px;
+}
+
 .status .time,
+.status .status-meta,
 .notification-compact .time
 {
     color: #606060;
-    vertical-align: middle;
     font-size: 14px;
-    padding-left: 5px;
     text-decoration: none;
 }
 
@@ -1448,6 +1478,11 @@ p}
     padding: 5px;
 }
 
+.status-buttons
+{
+    float: right;
+}
+
 .statusbox .statusfooter
 {
     display: block;
@@ -1465,11 +1500,26 @@ p}
     float: right;
 }
 
+.status-interact .statbtn-form
+{
+    display: inline-block;
+}
+
 .status-interact .statbtn
 {
-    display: block;
-    padding: 3px 0px 5px;
-    min-width: 42px;
+    display: inline-block;
+    padding: 3px 0px 3px;
+    min-width: 35px;
+}
+
+.status-interact .statbtn-last
+{
+    min-width: 26px;
+}
+
+.status-interact .statbtn.view-btn
+{
+    min-width: 19px;
 }
 
 .status-interact .statbtn svg
@@ -1480,9 +1530,19 @@ p}
     vertical-align: middle;
 }
 
-.view-btn
+.status-interact svg.expand
 {
-    min-width: 25px !important;
+    width: 13px;
+    height: 13px;
+}
+
+.status-interact .count
+{
+    padding-top: 3px;
+    font-size: 12px;
+    padding-bottom: 3px;
+    padding-right: 7px;
+    vertical-align: middle;
 }
 
 .statusbox .post-group
@@ -1553,12 +1613,12 @@ p}
     100% { transform: rotateZ(360deg); }
 }
 
-.status-interact svg.repeat.active
+.status-interact .statbtn.interacted svg.repeat
 {
     stroke: #08d345;
 }
 
-.status-interact svg.like.active
+.status-interact .statbtn.interacted svg.like
 {
     fill: #fcd202;
     stroke: #fcd202;
@@ -1574,7 +1634,7 @@ p}
 
 .status-interact svg.like:hover,
 .status-interact svg.like:active,
-.statis-interact svg.like:focus
+.status-interact svg.like:focus
 {
     stroke: #fcd202;
     pointer: select;
@@ -1582,20 +1642,11 @@ p}
 
 .status-interact svg.repeat:hover,
 .status-interact svg.repeat:active,
-.statis-interact svg.repeat:focus
+.status-interact svg.repeat:focus
 {
     stroke: #08d345;
 }
 
-.status-interact .count
-{
-    padding-top: 3px;
-    font-size: 12px;
-    padding-bottom: 3px;
-    padding-right: 7px;
-    vertical-align: middle;
-}
-
 /* Emoji */
 .status-content .emoji,
 .notification-content .emoji,
diff --git a/src/applications.c b/src/applications.c
new file mode 100644
index 0000000..a257a97
--- /dev/null
+++ b/src/applications.c
@@ -0,0 +1,36 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "applications.h"
+
+HV* perlify_application(const struct mstdnt_app* app)
+{
+    if (!app) return NULL;
+    
+    HV* app_hv = newHV();
+    hvstores_str(app_hv, "id", app->id);
+    hvstores_str(app_hv, "name", app->name);
+    hvstores_str(app_hv, "website", app->website);
+    hvstores_str(app_hv, "redirect_uri", app->redirect_uri);
+    hvstores_str(app_hv, "client_id", app->client_id);
+    hvstores_str(app_hv, "client_secret", app->client_secret);
+    hvstores_str(app_hv, "vapid_key", app->vapid_key);
+
+    return app_hv;
+}
+
diff --git a/src/applications.h b/src/applications.h
new file mode 100644
index 0000000..38096c1
--- /dev/null
+++ b/src/applications.h
@@ -0,0 +1,26 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef APPLICATIONS_H
+#define APPLICATIONS_H
+#include <mastodont.h>
+#include "global_perl.h"
+
+HV* perlify_application(const struct mstdnt_app* app);
+
+#endif /* APPLICATIONS_H */
diff --git a/src/status.c b/src/status.c
index 8b1c06f..83adbf9 100644
--- a/src/status.c
+++ b/src/status.c
@@ -23,6 +23,7 @@
 #include "helpers.h"
 #include "http.h"
 #include "base_page.h"
+#include "applications.h"
 #include "status.h"
 #include "easprintf.h"
 #include "query.h"
@@ -1044,6 +1045,7 @@ HV* perlify_status(const struct mstdnt_status* status)
     hvstores_int(status_hv, "favourites_count", status->favourites_count);
     hvstores_int(status_hv, "replies_count", status->replies_count);
     hvstores_ref(status_hv, "status", perlify_status(status->reblog));
+    hvstores_ref(status_hv, "application", perlify_application(status->application));
     hvstores_ref(status_hv, "media_attachments",
                  perlify_attachments(status->media_attachments, status->media_attachments_len));
     hvstores_ref(status_hv, "emojis", perlify_emojis(status->emojis, status->emojis_len));
diff --git a/templates/status.tt b/templates/status.tt
index 00f30f9..2a4075f 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -74,72 +74,64 @@
                         </div>
                     [% END %]
                     <div class="status-interact">
-                        <table class="ui-table">
-                            <tr>
-                                <td>
-                                    <label for="status-quickreply-[% status.id %]" class="pointer statbtn reply-btn">
-                                        [% icon('reply') %]
-                                        [% IF status.replies_count %]
-                                            <span class="count">[% status.replies_count %]</span>
-                                        [% END %]
-                                    </label>
-                                </td>
-                                <td>
-                                    <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                        <input class="itype" type="hidden" name="itype" value="{{%s:unrepeat}}repeat">
-                                        <label class="repeat-btn pointer statbtn">
-                                            [% icon('repeat') %]
-                                            [% IF status.reblogs_count %]
-                                                <span class="count">[% status.reblogs_count %]</span>
-                                            [% END %]
-                                            <input class="hidden" type="submit" value="Repeat">
-                                        </label>
-                                    </form>
-                                </td>
-                                <td>
-                                    <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                        <input class="itype" type="hidden" name="itype" value="{{%s:unfavourite}}like">
-                                        <label class="pointer statbtn like-btn">
-                                            [% icon('like') %]
-                                            [% IF status.favourites_count %]
-                                                <span class="count">[% status.favourites_count %]</span>
-                                            [% END %]
-                                            <input class="hidden" type="submit" value="Like">
-                                        </label>
-                                    </form>
-                                </td>
-                                [% IF ssn.config.stat_oneclicksoftware %]
-                                    <td>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input class="itype" type="hidden" name="itype" value="likeboost">
-                                            <label class="pointer statbtn likeboost-btn">
-                                                [% icon('likeboost') %]
-                                                
-                                                <input class="hidden" type="submit" value="L+R">
-                                            </label>
-                                        </form>
-                                    </td>
+                        <div class="status-buttons">
+                            <label for="status-quickreply-[% status.id %]" class="pointer statbtn reply-btn">
+                                [% icon('reply') %]
+                                [% IF status.replies_count %]
+                                    <span class="count">[% status.replies_count %]</span>
                                 [% END %]
-                                <td>
-                                    <a target="_parent" href="$prefix/status/[% status.id %]/react#[% status.id %]" class="pointer statbtn react-btn">
-                                        [% icon('emoji') %]
-                                    </a>
-                                    [% IF emoji_picker -%]
-                                        [% emoji_picker %]
-                                    [%- END %]
-                                </td>
-                                <td>
-                                    <a target="_parent" href="$prefix/status/[% status.id %]#[% status.id %]" class="pointer statbtn view-btn">
-                                        [% icon('expand') %]
-                                    </a>
-                                </td>
-                                <td>
-                                    <a href="#[% status.id %]" class="time">
-                                        [%- rel_to_str(status.created_at) -%]
-                                    </a>
-                                </td>
-                            </tr>
-                        </table>
+                            </label>
+                            <form action="$prefix/status/[% status.id %]/interact" method="post" class="statbtn-form">
+                                <input class="itype" type="hidden" name="itype" value="[% IF status.favourited %]un[% END %]like">
+                                <label class="pointer statbtn like-btn[% IF status.favourited %] interacted[% END %]">
+                                    [% icon('like') %]
+                                    [% IF status.favourites_count %]
+                                        <span class="count">[% status.favourites_count %]</span>
+                                    [% END %]
+                                    <input class="hidden" type="submit" value="Like">
+                                </label>
+                            </form>
+                            <form action="$prefix/status/[% status.id %]/interact" method="post" class="statbtn-form">
+                                <input class="itype" type="hidden" name="itype" value="[% IF status.reblogged %]un[% END %]repeat">
+                                <label class="repeat-btn pointer statbtn[% IF status.reblogged %] interacted[% END %]">
+                                    [% icon('repeat') %]
+                                    [% IF status.reblogs_count %]
+                                        <span class="count">[% status.reblogs_count %]</span>
+                                    [% END %]
+                                    <input class="hidden" type="submit" value="Repeat">
+                                </label>
+                            </form>
+                            [% IF ssn.config.stat_oneclicksoftware %]
+                                <form action="$prefix/status/[% status.id %]/interact" method="post" class="statbtn-form">
+                                    <input class="itype" type="hidden" name="itype" value="likeboost">
+                                    <label class="pointer statbtn likeboost-btn">
+                                        [% icon('likeboost') %]
+                                        
+                                        <input class="hidden" type="submit" value="L+R">
+                                    </label>
+                                </form>
+                            [% END %]
+                            <a target="_parent" class="statbtn statbtn-last" href="$prefix/status/[% status.id %]/react#[% status.id %]" class="pointer statbtn react-btn">
+                                [% icon('emoji') %]
+                            </a>
+                            [% IF emoji_picker -%]
+                                [% emoji_picker %]
+                            [%- END %]
+                        </div>
+                        [%# Put these at the end, incase someone wants to move status icons to the beginning (this makes it easier %]
+                        <a target="_parent" href="$prefix/status/[% status.id %]#[% status.id %]" class="pointer statbtn view-btn">
+                            [% icon('expand') %]
+                        </a> 
+                        <span class="status-meta">
+                            <a href="#[% status.id %]" title="[% time_to_str(status.created_at) %]" class="time">[%- rel_to_str(status.created_at) -%]</a>
+                            [% IF status.application && status.application.name %]
+                                [% IF status.application.url %]
+                                    <a class="application-name" href="[% status.application.url %]">[% status.application.name %]</a>
+                                [% ELSE %]
+                                    <span class="application-name">[% status.application.name %]</span>
+                                [% END %]
+                            [% END %]
+                        </span>
                     </div>
                 </div>
             </td>
@@ -147,5 +139,5 @@
     </table>
 </div>
 <input type="checkbox" class="quickreply-hide hidden" id="status-quickreply-[% status.id %]">
-{{ %s : reply }}
+<!-- {{ %s : reply }} -->
 

From 7d0de2754f1a92b7c2a148dc24de2832f6401ce3 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 31 Jul 2022 05:59:21 +0000
Subject: [PATCH 024/143] Titles, Emojis, Greentexts, and more

FossilOrigin-Name: 7166edf7fcd136ffbda39d2f36e96832690cf978a1c5df4bb6d172f8a2e905ac
---
 Makefile               |  6 +++++-
 dist/treebird.css      | 23 +++++++++++++----------
 docs/INSTALL.md        | 14 ++++++++++++++
 perl/status.pm         | 12 +++++++++---
 perl/string_helpers.pm | 32 ++++++++++++++++++++++++++++++--
 templates/status.tt    |  7 +++++--
 6 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 0689bca..ee8dd0f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,10 @@ all:
 	$(MAKE) make_pagescobj
 	$(MAKE) $(TARGET)
 
+install_deps:
+	cpan HTML::Escape
+	cpan Template::Toolkit
+
 make_ctmpls: $(TMPLS_C)
 make_pages: $(PAGES_CMP)
 make_pagesc: $(PAGES_C)
@@ -103,4 +107,4 @@ clean_deps:
 
 clean_all: clean clean_deps
 
-.PHONY: all filec clean update clean clean_deps clean_all test
+.PHONY: all filec clean update clean clean_deps clean_all test install_deps
diff --git a/dist/treebird.css b/dist/treebird.css
index 4e07b0f..e096a33 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -85,10 +85,9 @@ a, a:visited, a:hover, a:active
     border-radius: 3px;
 }
 
-.greentext
-{
-    color: #00aa00;
-}
+.greentext { color: #00aa00; }
+.bluetext { color: #0060aa; }
+.yellowtext { color: #cccc00; }
 
 /* Cleans up most of the tables */
 table.ui-table td
@@ -1038,6 +1037,15 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     display: block;
 }
 
+.status-content .title
+{
+    display: block;
+    padding: 2px 2px 7px;
+    margin-bottom: 7px;
+    font-style: italic;
+    border-bottom: 1px solid #cacaca;
+}
+
 .status .status-content p,
 .status .status-content a
 {
@@ -1509,12 +1517,7 @@ p}
 {
     display: inline-block;
     padding: 3px 0px 3px;
-    min-width: 35px;
-}
-
-.status-interact .statbtn-last
-{
-    min-width: 26px;
+    min-width: 25px;
 }
 
 .status-interact .statbtn.view-btn
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 3a942ec..e83fc9c 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -24,6 +24,20 @@ Run `make`. This will also clone mastodont-c, and compile both it and Treebird.
 
 If you `fossil update` any changes, `make update` should be run after updating
 
+## Perl dependencies
+
+Treebird renders most of the content that you see in Perl using the Template Toolkit.
+
+You can install it by running `make install_deps`
+
+If that doesn't work, you can open a CPAN shell
+
+```
+perl -MCPAN -e shell
+install Template::Toolkit
+install HTML::Escape
+```
+
 ## Installation
 
 Run `# make install`
diff --git a/perl/status.pm b/perl/status.pm
index 4faabd7..1d61534 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,7 +1,8 @@
 package status;
 use strict;
 use warnings;
-use string_helpers qw( reltime_to_str );
+use HTML::Escape 'escape_html';
+use string_helpers qw( reltime_to_str greentextify emojify format_username );
 use icons qw( get_icon visibility_to_icon );
 use attachments 'generate_attachment';
 use emojis 'generate_emoji';
@@ -19,9 +20,16 @@ sub generate_status
         prefix => '',
         ssn => $ssn,
         status => $status,
+        # Functions
         icon => \&get_icon,
         rel_to_str => \&reltime_to_str,
         vis_to_icon => \&visibility_to_icon,
+        make_att => \&generate_attachment,
+        make_emoji => \&generate_emoji,
+        greentextify => \&greentextify,
+        emojify => \&emojify,
+        escape => \&escape_html,
+        format_username => \&format_username,
         );
 
     to_template(\%vars, \$data->{'status.tt'});
@@ -40,8 +48,6 @@ sub content_status
         statuses_after => $statuses_after,
         # Functions
         create_status => \&generate_status,
-        make_att => \&generate_attachment,
-        make_emoji => \&generate_emoji,
         );
 
 
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 8dff450..28b95b6 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -1,10 +1,10 @@
 package string_helpers;
 use strict;
 use warnings;
-
+use HTML::Escape 'escape_html';
 use Exporter 'import';
 
-our @EXPORT = qw( &reltime_to_str );
+our @EXPORT = qw( reltime_to_str greentextify emojify format_username );
 
 sub reltime_to_str
 {
@@ -17,3 +17,31 @@ sub reltime_to_str
     return int($since / (60 * 60 * 24 * 31)) . 'mon' if $since < 60 * 60 * 24 * 365;
     return int($since / (60 * 60 * 24 * 365)) . 'yr';
 }
+
+sub greentextify
+{
+    my $text = shift;
+    $text =~ s/((?:^|<br\/?>| )&gt;.*?)(?:<br\/?>|$)/<span class="greentext">$1<\/span><br>/gs;
+    $text =~ s/((?:^|<br\/?>| )&lt;.*?)(?:<br\/?>|$)/<span class="bluetext">$1<\/span><br>/gs;
+    $text =~ s/((?:^|<br\/?>| )\^.*?)(?:<br\/?>|$)/<span class="yellowtext">$1<\/span><br>/gs;
+    $text;
+}
+
+sub emojify
+{
+    my ($text, $emojis) = @_;
+    foreach my $emoji (@{$emojis})
+    {
+        my $emo = $emoji->{shortcode};
+        my $url = $emoji->{url};
+        $text =~ s/:$emo:/<img class="emoji" src="$url" loading="lazy">/gsi;
+    }
+    $text;
+}
+
+sub format_username
+{
+    my $username = shift;
+    emojify escape_html($username);
+}
+
diff --git a/templates/status.tt b/templates/status.tt
index 2a4075f..1868547 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -8,7 +8,7 @@
             </td>
             <td class="status-info">
                 <div class="poster-stats">
-                    <span class="username">[% status.account.display_name %]</span>
+                    <span class="username">[% format_username(status.account.display_name) %]</span>
                     <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     <span class="alignend">
                         <div class="menu-container status-visibility">
@@ -56,7 +56,10 @@
                         </span>
                     [% END %]
                     <span class="status-content">
-                        [% status.content %]
+                        [% IF status.spoiler_text %]
+                            <span class="title">[% emojify(escape(status.spoiler_text), status.emojis) %]</span>
+                        [% END %]
+                        [% greentextify(emojify(status.content, status.emojis)) %]
                     </span>
                     [% IF status.media_attachments %]
                         <div class="attachments">

From 4f07f2768fc4a8e13e774e0cb6ea8aed0457cd0b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 31 Jul 2022 21:10:48 +0000
Subject: [PATCH 025/143] Only show application name if focused

FossilOrigin-Name: dd9cf53f4b67929188af70ef57ebead4467a2e21017afc705360189d9bd7862b
---
 dist/treebird.css      |  5 +++++
 perl/string_helpers.pm | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index e096a33..3b6b310 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -821,6 +821,11 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     padding-left: 9px;
 }
 
+.status:not(:target) .status-meta .application-name
+{
+    display: none;
+}
+
 .notification-info + .status,
 .notification-info-format + .status
 {
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 28b95b6..1d9041c 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -30,11 +30,14 @@ sub greentextify
 sub emojify
 {
     my ($text, $emojis) = @_;
-    foreach my $emoji (@{$emojis})
+    if ($emojis)
     {
-        my $emo = $emoji->{shortcode};
-        my $url = $emoji->{url};
-        $text =~ s/:$emo:/<img class="emoji" src="$url" loading="lazy">/gsi;
+        foreach my $emoji (@{$emojis})
+        {
+            my $emo = $emoji->{shortcode};
+            my $url = $emoji->{url};
+            $text =~ s/:$emo:/<img class="emoji" src="$url" loading="lazy">/gsi;
+        }
     }
     $text;
 }

From 3ac0145efcfb9c383156d22004cb1caeaa21a7c2 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 1 Aug 2022 04:56:10 +0000
Subject: [PATCH 026/143] Postbox

FossilOrigin-Name: fa0971dfd73b18da2b62d02dcb1f3aa5ef301d17c21efab4ece79d5a6981a297
---
 perl/attachments.pm    |  4 ++-
 perl/postbox.pm        | 23 +++++++++++++
 perl/status.pm         |  3 ++
 perl/string_helpers.pm | 12 +++++--
 src/account.c          |  1 +
 src/global_perl.c      |  2 ++
 templates/postbox.tt   | 78 ++++++++++++++++++++++++++++++++++++++++++
 templates/status.tt    |  5 ++-
 8 files changed, 121 insertions(+), 7 deletions(-)
 create mode 100644 perl/postbox.pm
 create mode 100644 templates/postbox.tt

diff --git a/perl/attachments.pm b/perl/attachments.pm
index 6712fce..456deec 100644
--- a/perl/attachments.pm
+++ b/perl/attachments.pm
@@ -6,6 +6,7 @@ use Exporter 'import';
 our @EXPORT = qw( generate_attachment );
 
 use template_helpers 'to_template';
+use icons 'get_icon';
 
 sub generate_attachment
 {
@@ -15,7 +16,8 @@ sub generate_attachment
         prefix => '',
         ssn => $ssn,
         attachment => $att,
-        sensitive => $sensitive
+        sensitive => $sensitive,
+        icon => \&get_icon,
         );
 
     to_template(\%vars, \$data->{'attachment.tt'});
diff --git a/perl/postbox.pm b/perl/postbox.pm
new file mode 100644
index 0000000..a7c1e19
--- /dev/null
+++ b/perl/postbox.pm
@@ -0,0 +1,23 @@
+package postbox;
+use strict;
+use warnings;
+use template_helpers 'to_template';
+use string_helpers qw( get_mentions_from_content );
+use Exporter 'import';
+
+our @EXPORT = qw( generate_postbox );
+
+sub generate_postbox
+{
+    my ($ssn, $data, $status) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        data => $data,
+        status => $status,
+        mentionify => \&get_mentions_from_content,
+        );
+
+    to_template(\%vars, \$data->{'postbox.tt'});
+}
diff --git a/perl/status.pm b/perl/status.pm
index 1d61534..d491058 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -5,6 +5,7 @@ use HTML::Escape 'escape_html';
 use string_helpers qw( reltime_to_str greentextify emojify format_username );
 use icons qw( get_icon visibility_to_icon );
 use attachments 'generate_attachment';
+use postbox 'generate_postbox';
 use emojis 'generate_emoji';
 use Exporter 'import';
 
@@ -20,6 +21,7 @@ sub generate_status
         prefix => '',
         ssn => $ssn,
         status => $status,
+        data => $data,
         # Functions
         icon => \&get_icon,
         rel_to_str => \&reltime_to_str,
@@ -30,6 +32,7 @@ sub generate_status
         emojify => \&emojify,
         escape => \&escape_html,
         format_username => \&format_username,
+        make_postbox => \&generate_postbox,
         );
 
     to_template(\%vars, \$data->{'status.tt'});
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 1d9041c..7f3399d 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -4,7 +4,7 @@ use warnings;
 use HTML::Escape 'escape_html';
 use Exporter 'import';
 
-our @EXPORT = qw( reltime_to_str greentextify emojify format_username );
+our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content );
 
 sub reltime_to_str
 {
@@ -44,7 +44,13 @@ sub emojify
 
 sub format_username
 {
-    my $username = shift;
-    emojify escape_html($username);
+    my $account = shift;
+    emojify(escape_html($account->{display_name}), $account->{emojis});
 }
 
+sub get_mentions_from_content
+{
+    my $status = shift;
+    # todo
+    "";
+}
diff --git a/src/account.c b/src/account.c
index 93135a6..06290d7 100644
--- a/src/account.c
+++ b/src/account.c
@@ -900,6 +900,7 @@ HV* perlify_account(const struct mstdnt_account* acct)
     hvstores_int(acct_hv, "suspended", acct->suspended);
     hvstores_int(acct_hv, "locked", acct->locked);
     hvstores_int(acct_hv, "discoverable", acct->discoverable);
+    hvstores_ref(acct_hv, "emojis", perlify_emojis(acct->emojis, acct->emojis_len));
     
     return acct_hv;
 }
diff --git a/src/global_perl.c b/src/global_perl.c
index 02093ce..4e089bb 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -25,6 +25,7 @@
 #include "../templates/emoji_picker.ctt"
 #include "../templates/attachment.ctt"
 #include "../templates/emoji.ctt"
+#include "../templates/postbox.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -40,6 +41,7 @@ void init_template_files()
     hv_stores(template_files, "emoji_picker.tt", newSVpv(data_emoji_picker_tt, data_emoji_picker_tt_size));
     hv_stores(template_files, "attachment.tt", newSVpv(data_attachment_tt, data_attachment_tt_size));
     hv_stores(template_files, "emoji.tt", newSVpv(data_emoji_tt, data_emoji_tt_size));
+    hv_stores(template_files, "postbox.tt", newSVpv(data_postbox_tt, data_postbox_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/templates/postbox.tt b/templates/postbox.tt
new file mode 100644
index 0000000..83f274e
--- /dev/null
+++ b/templates/postbox.tt
@@ -0,0 +1,78 @@
+<form class="reply-form" action="$prefix/status/create" method="post" enctype="multipart/form-data">
+    [% IF status %]
+        <input type="hidden" name="replyid" value="[% status.in_reply_to_id %]">
+    [% END %]
+    <div class="statusbox">
+        <textarea name="content" placeholder="Just landed in N.Y." rows="5">
+            [%- IF status -%]
+                [%- mentionify(status) -%] 
+            [%- END -%]
+        </textarea>
+        <div class="statusfooter">
+            <div class="statusfooter-left">
+                <label>
+                    <input type="file" name="file" class="hidden" multiple>
+                    <div class="file-upload-btn btn-icon">
+                        [% icon('fileclip') %]
+                    </div>
+                </label>
+                <select name="contenttype" class="content-type">
+                    <option value="plaintext">Plain Text</option>
+                    <option value="markdown">Markdown</option>
+                    <option value="html">HTML</option>
+                    <option value="bbcode">BBCode</option>
+                </select>
+                <div class="post-group">
+                    <!-- Local -->
+                    <label>
+                        <input type="radio" name="visibility" value="local" class="hidden"
+                               [%- IF status.visibility == 6 %] checked[% END %]>
+                        <div class="visibility-icon vis-local">
+                            [% icon('local') %]
+                        </div>
+                    </label>
+                    <!-- Direct -->
+                    <label>
+                        <input type="radio" name="visibility" value="direct" class="hidden"
+                               [%- IF status.visibility == 5 %] checked[% END %]>
+                        <div class="visibility-icon vis-direct">
+                            [% icon('direct') %]
+                        </div>
+                    </label>
+                    <!-- Private -->
+                    <label>
+                        <input type="radio" name="visibility" value="private" class="hidden"
+                               [%- IF status.visibility == 3 %] checked[% END %]
+                               [%- IF status.visibility > 3 %] disabled[% END %]>
+                        <div class="visibility-icon vis-private">
+                            [% icon('private') %]
+                        </div>
+                    </label>
+                    <!-- Unlisted -->
+                    <label>
+                        <input type="radio" name="visibility" value="unlisted" class="hidden"
+                               [%- IF status.visibility == 2 %] checked[% END %]
+                               [%- IF status.visibility > 2 %] disabled[% END %]>
+                        <div class="visibility-icon vis-unlisted">
+                            [% icon('unlisted') %]
+                        </div>
+                    </label>
+                    <!-- Public -->
+                    <label>
+                        <input type="radio" name="visibility" value="public" class="hidden"
+                               [%- IF status.visibility == 1 %] checked[% END %]
+                               [%- IF status.visibility > 2 %] disabled[% END %]>
+                        <div class="visibility-icon vis-public">
+                            [% icon('public') %]
+                        </div>
+                    </label>
+                </div>
+            </div>
+            <div class="statusfooter-right">
+                <input type="submit" value="Post" class="btn post-btn">
+            </div>
+        </div>
+        <div class="file-uploads-container hidden"></div>
+    </div>
+</form>
+
diff --git a/templates/status.tt b/templates/status.tt
index 1868547..a1f060a 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -8,7 +8,7 @@
             </td>
             <td class="status-info">
                 <div class="poster-stats">
-                    <span class="username">[% format_username(status.account.display_name) %]</span>
+                    <span class="username">[% format_username(status.account) %]</span>
                     <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     <span class="alignend">
                         <div class="menu-container status-visibility">
@@ -142,5 +142,4 @@
     </table>
 </div>
 <input type="checkbox" class="quickreply-hide hidden" id="status-quickreply-[% status.id %]">
-<!-- {{ %s : reply }} -->
-
+[% make_postbox(ssn, data, status) %]

From 19f5e5c14dd2cd54e7c58980a0740f2c820b9367 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 1 Aug 2022 05:17:32 +0000
Subject: [PATCH 027/143] Get mentions from content

FossilOrigin-Name: 29716d4f981e4cc8750de01a82dea395044c472165ede67954ac7cc781c3532d
---
 perl/string_helpers.pm | 13 +++++++++++--
 src/reply.c            |  2 +-
 templates/postbox.tt   |  6 +-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 7f3399d..622f51c 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -50,7 +50,16 @@ sub format_username
 
 sub get_mentions_from_content
 {
-    my $status = shift;
+    my ($ssn, $status) = @_;
+    my $result = '';
+    my $acct;
     # todo
-    "";
+    while ($status->{'content'} =~
+           /<a .*?href=\"https?:\/\/(.*?)\/(?:@|users\/|u\/)?(.*?)?\".*?>@(?:<span>)?.*?(?:<\/span>)?/gs)
+    {
+        $acct = $2 . '@' . $1;
+        $result .= '@' . $acct . ' ' if $ssn->{account}->{acct} eq $acct;
+    }
+    ($status->{account}->{acct} eq $ssn->{account}->{acct})
+        ? $result : '@' . $status->{account}->{acct} . ' ' . $result;
 }
diff --git a/src/reply.c b/src/reply.c
index 7203cde..2e9dc0b 100644
--- a/src/reply.c
+++ b/src/reply.c
@@ -75,7 +75,7 @@ char* construct_post_box(struct mstdnt_status* reply_status,
  *    so we just grep for regex href
  *  - Misskey/Mastodon adds an @ symbol in the href param, while pleroma adds /users and honk adds /u
  */
-#define REGEX_REPLY "<a .*?href=\"https?:\\/\\/(.*?)\\/(?:@|users/|u/)?(.*?)?\".*?>@(?:<span>)?.*?(?:<\\/span>)?"
+#define REGEX_REPLY ""
 
 char* reply_status(struct session* ssn, char* id, struct mstdnt_status* status)
 {
diff --git a/templates/postbox.tt b/templates/postbox.tt
index 83f274e..46b4c06 100644
--- a/templates/postbox.tt
+++ b/templates/postbox.tt
@@ -3,11 +3,7 @@
         <input type="hidden" name="replyid" value="[% status.in_reply_to_id %]">
     [% END %]
     <div class="statusbox">
-        <textarea name="content" placeholder="Just landed in N.Y." rows="5">
-            [%- IF status -%]
-                [%- mentionify(status) -%] 
-            [%- END -%]
-        </textarea>
+        <textarea name="content" placeholder="Just landed in N.Y." rows="5">[% IF status %][% mentionify(ssn, status) %][% END %]</textarea>
         <div class="statusfooter">
             <div class="statusfooter-left">
                 <label>

From b745b140d9496121460578a14bb6d353fe9c07d4 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 1 Aug 2022 05:25:48 +0000
Subject: [PATCH 028/143] Don't show post box if not logged in

FossilOrigin-Name: 89d85ad2a2ed246fed646d8d7b3e05929a55624530ec150e05b04055925d114b
---
 templates/status.tt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/status.tt b/templates/status.tt
index a1f060a..f77940c 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -142,4 +142,6 @@
     </table>
 </div>
 <input type="checkbox" class="quickreply-hide hidden" id="status-quickreply-[% status.id %]">
-[% make_postbox(ssn, data, status) %]
+[% IF ssn.logged_in %]
+    [% make_postbox(ssn, data, status) %]
+[% END %]

From 70b3fd761125fce921c35f3d21e623dc50f28ae9 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 3 Aug 2022 05:08:37 +0000
Subject: [PATCH 029/143] Finish statuses

FossilOrigin-Name: 4fe6d637a9f0610b978c32c1a39851546b141c37fd275ee5d44c57884a528a12
---
 perl/status.pm         |  3 ++-
 perl/string_helpers.pm | 24 ++++++++++++++++++------
 src/reply.c            |  2 +-
 src/status.c           |  2 +-
 templates/status.tt    |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/perl/status.pm b/perl/status.pm
index d491058..b4249a3 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -2,7 +2,7 @@ package status;
 use strict;
 use warnings;
 use HTML::Escape 'escape_html';
-use string_helpers qw( reltime_to_str greentextify emojify format_username );
+use string_helpers qw( reltime_to_str greentextify emojify format_username localize_mentions );
 use icons qw( get_icon visibility_to_icon );
 use attachments 'generate_attachment';
 use postbox 'generate_postbox';
@@ -31,6 +31,7 @@ sub generate_status
         greentextify => \&greentextify,
         emojify => \&emojify,
         escape => \&escape_html,
+        fix_mentions => \&localize_mentions,
         format_username => \&format_username,
         make_postbox => \&generate_postbox,
         );
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 622f51c..6dfeb65 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -4,7 +4,9 @@ use warnings;
 use HTML::Escape 'escape_html';
 use Exporter 'import';
 
-our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content );
+our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions );
+
+my $re_mentions = '(?=<a .*?mention.*?)<a .*?href="https?:\/\/(.*?)\/(?:@|users\/|\/u)?(.*?)?".*?>';
 
 sub reltime_to_str
 {
@@ -21,9 +23,9 @@ sub reltime_to_str
 sub greentextify
 {
     my $text = shift;
-    $text =~ s/((?:^|<br\/?>| )&gt;.*?)(?:<br\/?>|$)/<span class="greentext">$1<\/span><br>/gs;
-    $text =~ s/((?:^|<br\/?>| )&lt;.*?)(?:<br\/?>|$)/<span class="bluetext">$1<\/span><br>/gs;
-    $text =~ s/((?:^|<br\/?>| )\^.*?)(?:<br\/?>|$)/<span class="yellowtext">$1<\/span><br>/gs;
+    $text =~ s/(&gt;.*?)(?=<|$)/<span class="greentext">$1<\/span>/gs;
+    $text =~ s/(&lt;.*?)(?=<|$)/<span class="bluetext">$1<\/span>/gs;
+    $text =~ s/(?:^|>| )(\^.*?)(?=<|$)/<span class="yellowtext">$1<\/span>/gs;
     $text;
 }
 
@@ -48,17 +50,27 @@ sub format_username
     emojify(escape_html($account->{display_name}), $account->{emojis});
 }
 
+sub localize_mentions
+{
+    my $text = shift;
+    # idk how to work around this 
+    my $at = '@';
+                            
+    $text =~ s/$re_mentions/<a target="_parent" class="mention" href="$at$2$at$1">/gs;
+    $text;
+}
+
 sub get_mentions_from_content
 {
     my ($ssn, $status) = @_;
     my $result = '';
     my $acct;
-    # todo
     while ($status->{'content'} =~
            /<a .*?href=\"https?:\/\/(.*?)\/(?:@|users\/|u\/)?(.*?)?\".*?>@(?:<span>)?.*?(?:<\/span>)?/gs)
     {
         $acct = $2 . '@' . $1;
-        $result .= '@' . $acct . ' ' if $ssn->{account}->{acct} eq $acct;
+        # TODO this does not account for the domain (alt interference)
+        $result .= '@' . $acct unless $ssn->{account}->{acct} eq $2;
     }
     ($status->{account}->{acct} eq $ssn->{account}->{acct})
         ? $result : '@' . $status->{account}->{acct} . ' ' . $result;
diff --git a/src/reply.c b/src/reply.c
index 2e9dc0b..7203cde 100644
--- a/src/reply.c
+++ b/src/reply.c
@@ -75,7 +75,7 @@ char* construct_post_box(struct mstdnt_status* reply_status,
  *    so we just grep for regex href
  *  - Misskey/Mastodon adds an @ symbol in the href param, while pleroma adds /users and honk adds /u
  */
-#define REGEX_REPLY ""
+#define REGEX_REPLY "<a .*?href=\"https?:\\/\\/(.*?)\\/(?:@|users/|u/)?(.*?)?\".*?>@(?:<span>)?.*?(?:<\\/span>)?"
 
 char* reply_status(struct session* ssn, char* id, struct mstdnt_status* status)
 {
diff --git a/src/status.c b/src/status.c
index 83adbf9..e93ead7 100644
--- a/src/status.c
+++ b/src/status.c
@@ -434,7 +434,7 @@ char* reformat_status(struct session* ssn,
     return res;
 }
 
-#define REGEX_MENTION "(?=<a .*?mention.*?)<a .*?href=\"https?:\\/\\/(.*?)\\/(?:@|users\\/)?(.*?)?\".*?>"
+#define REGEX_MENTION "(?=<a .*?mention.*?)<a .*?href=\"https?:\\/\\/(?<url>.*?)\\/(?:@|users\\/)?(?<>.*?)?\".*?>"
 
 char* make_mentions_local(char* content)
 {
diff --git a/templates/status.tt b/templates/status.tt
index f77940c..b87821a 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -59,7 +59,7 @@
                         [% IF status.spoiler_text %]
                             <span class="title">[% emojify(escape(status.spoiler_text), status.emojis) %]</span>
                         [% END %]
-                        [% greentextify(emojify(status.content, status.emojis)) %]
+                        [% greentextify(emojify(fix_mentions(status.content), status.emojis)) %]
                     </span>
                     [% IF status.media_attachments %]
                         <div class="attachments">

From afba0ef35ce95d6c01f509537898e10d622ca74c Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 3 Aug 2022 05:09:15 +0000
Subject: [PATCH 030/143] Link to origin

FossilOrigin-Name: e3dbf360000f832d1d3ddb4728a0db01689ebcf296e65badf2a3d4a933f284a5
---
 perl/string_helpers.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 6dfeb65..62be6ee 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -56,7 +56,7 @@ sub localize_mentions
     # idk how to work around this 
     my $at = '@';
                             
-    $text =~ s/$re_mentions/<a target="_parent" class="mention" href="$at$2$at$1">/gs;
+    $text =~ s/$re_mentions/<a target="_parent" class="mention" href="\/$at$2$at$1">/gs;
     $text;
 }
 

From a3bb29d01a1efea8c02ec112352914af75b986cf Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 01:15:17 +0000
Subject: [PATCH 031/143] Perl timeline C

FossilOrigin-Name: c078ecf81d0273400acba2d3be987a8a0363eb6bd540beebb8f2427348707496
---
 perl/timeline.pm  | 24 +++++++++++++
 src/global_perl.h |  6 ++--
 src/status.c      |  8 ++---
 src/timeline.c    | 92 +++++++++++++++++------------------------------
 src/timeline.h    | 41 ++++++++++++++++++++-
 5 files changed, 104 insertions(+), 67 deletions(-)
 create mode 100644 perl/timeline.pm

diff --git a/perl/timeline.pm b/perl/timeline.pm
new file mode 100644
index 0000000..ad088cd
--- /dev/null
+++ b/perl/timeline.pm
@@ -0,0 +1,24 @@
+package timeline;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORT = qw( generate_attachment );
+
+use template_helpers 'to_template';
+use icons 'get_icon';
+
+sub content_timeline
+{
+    my ($ssn, $data, $statuses, $title, $show_post_box) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        statuses => $statuses,
+        title => $title,
+        post_box => $show_post_box,
+        );
+
+    to_template(\&vars, \&data->{'attachment.tt'});
+}
diff --git a/src/global_perl.h b/src/global_perl.h
index 78e501b..bbe8a8a 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -32,8 +32,10 @@ static PerlInterpreter* perl;
 extern HV* template_files;
 extern pthread_mutex_t perl_mutex;
 
-#define perl_lock() if(1) { pthread_mutex_lock(&perl_mutex); }
-#define perl_unlock() if(1) { pthread_mutex_unlock(&perl_mutex); }
+#define perl_lock() do { pthread_mutex_lock(&perl_mutex); } while (1)
+#define perl_unlock() do { pthread_mutex_unlock(&perl_mutex); } while (1)
+
+#define ARG_UNDEFINED() do { XPUSHs(&PL_sv_undef); } while (1)
 
 void init_template_files();
 void cleanup_template_files();
diff --git a/src/status.c b/src/status.c
index e93ead7..fb1998e 100644
--- a/src/status.c
+++ b/src/status.c
@@ -948,15 +948,15 @@ void content_status(PATH_ARGS, uint8_t flags)
     PUSHMARK(SP);
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_inc((SV*)session_hv));
-    XPUSHs(newRV_inc((SV*)template_files));
-    XPUSHs(newRV_inc((SV*)perlify_status(&status)));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_status(&status)));
     if (statuses_before)
-        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_before, stat_before_len)));
+        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_before, stat_before_len)));
     else
         XPUSHs(&PL_sv_undef);
     
     if (statuses_after)
-        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_after, stat_after_len)));
+        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_after, stat_after_len)));
     else
         XPUSHs(&PL_sv_undef);
     // ARGS
diff --git a/src/timeline.c b/src/timeline.c
index 445523f..0962d86 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -30,6 +30,7 @@
 #include "query.h"
 #include "error.h"
 #include "string_helpers.h"
+#include "perl_global.h"
 
 #include "../static/timeline_options.ctmpl"
 #include "../static/navigation.ctmpl"
@@ -44,65 +45,41 @@ void content_timeline(FCGX_Request* req,
                       char* header_text,
                       int show_post_box)
 {
-    size_t statuses_html_count = 0;
-    char* status_format = NULL,
-        * header = NULL,
-        * post_box = NULL,
-        * navigation_box = NULL,
-        * timeline_options,
-        * output = NULL,
-        * start_id;
-
-    if (storage->error)
-        status_format = construct_error(storage->error, E_ERROR, 1, NULL);
-    else
-    {
-        // Construct statuses into HTML
-        status_format = construct_statuses(ssn, api, statuses, statuses_len, NULL, &statuses_html_count);
-        if (!status_format)
-            status_format = construct_error("No statuses", E_NOTICE, 1, NULL);
-    }
-
-    // Create post box
-    if (show_post_box)
-        post_box = construct_post_box(NULL, "", NULL);
-
-    if (statuses)
-    {
-        // If not set, set it
-        start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : statuses[0].id;
-        navigation_box = construct_navigation_box(start_id,
-                                                  statuses[0].id,
-                                                  statuses[statuses_len-1].id,
-                                                  NULL);
-    }
-
-    // Create timeline options/menubar
-    struct timeline_options_template todata = {
-        .only_media = "Only media?",
-        .replies = "Replies?",
-        .only_media_active = keyint(ssn->post.only_media) ? "checked" : NULL,
-    };
-
-    timeline_options = tmpl_gen_timeline_options(&todata, NULL);
-
-    // Display a header bar, usually customized for specific pages
-    if (header_text)
-    {
-        easprintf(&header, "<div class=\"simple-page simple-page-header\"><h1>%s</h1></div>",
-                  header_text);
-    }
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
     
-    easprintf(&output, "%s%s%s%s%s",
-              STR_NULL_EMPTY(header),
-              STR_NULL_EMPTY(post_box),
-              STR_NULL_EMPTY(timeline_options),
-              STR_NULL_EMPTY(status_format),
-              STR_NULL_EMPTY(navigation_box));
+    if (statuses)
+        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses, statuses_len)));
+    else ARG_UNDEFINED();
 
+    if (title)
+        XPUSHs(newSVpv(header_text, 0));
+    else ARG_UNDEFINED();
+
+    XPUSHi(show_post_box);
+
+    PUTBACK;
+    call_pv("status::content_timeline", G_SCALAR);
+    SPAGAIN;
+
+    // Duplicate to free temps
+    char* dup = savesharedsvpv(POPs);
+
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
+    
     struct base_page b = {
         .category = cat,
         .content = output,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
@@ -112,12 +89,7 @@ void content_timeline(FCGX_Request* req,
     // Cleanup
     mastodont_storage_cleanup(storage);
     mstdnt_cleanup_statuses(statuses, statuses_len);
-    free(status_format);
-    free(post_box);
-    free(header);
-    free(timeline_options);
-    free(navigation_box);
-    free(output);
+    Safefree(dup);
 }
 
 void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local)
diff --git a/src/timeline.h b/src/timeline.h
index c2cfcd3..ae20632 100644
--- a/src/timeline.h
+++ b/src/timeline.h
@@ -26,19 +26,58 @@
 #include "session.h"
 #include "base_page.h"
 
-// Federated and local are here
+/** Wrapper for content_tl_federated */
 void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local);
+
+/** Wrapper for content_tl_direct */
 void tl_direct(FCGX_Request* req, struct session* ssn, mastodont_t* api);
+
+/** Wrapper for content_tl_federated */
 void tl_public(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local, enum base_category cat);
+
+/** Wrapper for content_tl_list */
 void tl_list(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* list_id);
+
+/** Wrapper for content_tl_tag */
 void tl_tag(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* tag);
 
+/* ------------------------------------------------ */
+
+/** Federated timeline */
 void content_tl_federated(PATH_ARGS);
+
+/** Home timeline. Shows federated timeline if not logged in */
 void content_tl_home(PATH_ARGS);
+
+/** Direct message timeline */
 void content_tl_direct(PATH_ARGS);
+
+/** Local/instance timeline */
 void content_tl_local(PATH_ARGS);
+
+/** List timeline */
 void content_tl_list(PATH_ARGS);
+
+/** Hashtag timeline */
 void content_tl_tag(PATH_ARGS);
+
+/**
+ * Used to create generic timeline content. This timeline includes other features
+ * such as viewing only media, hiding muted, etc. as options on the top of the
+ * timeline, so this should only be used for API's which are considered "timelines"
+ * to Pleroma/Mastodon.
+ *
+ * @param req This request
+ * @param ssn This session
+ * @param api The api
+ * @param storage The storage for statuses, will be cleaned up in this function, do NOT
+ *                cleanup yourself.
+ * @param statuses The statuses, will be cleaned up in this function, do NOT cleanup yourself.
+ * @param statuses_len Length of `statuses`
+ * @param cat The category to "highlight" on the sidebar
+ * @param header A header that is displayed above the timeline.
+ * @param show_post_box If the post box should be shown or not.
+ */
 void content_timeline(FCGX_Request* req,
                       struct session* ssn,
                       mastodont_t* api,

From ff3d3834645535bd225e996e80b596d51ecbd1d4 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 02:47:48 +0000
Subject: [PATCH 032/143] Timeline template

FossilOrigin-Name: 33082559569a1dd5aa038d4636583d0918253724defbb58570f5baafe06220d1
---
 perl/timeline.pm      |  4 ++--
 src/global_perl.c     |  2 ++
 src/status.c          |  2 +-
 templates/timeline.tt | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 templates/timeline.tt

diff --git a/perl/timeline.pm b/perl/timeline.pm
index ad088cd..482916b 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -17,8 +17,8 @@ sub content_timeline
         ssn => $ssn,
         statuses => $statuses,
         title => $title,
-        post_box => $show_post_box,
+        show_post_box => $show_post_box,
         );
 
-    to_template(\&vars, \&data->{'attachment.tt'});
+    to_template(\&vars, \&data->{'timeline.tt'});
 }
diff --git a/src/global_perl.c b/src/global_perl.c
index 4e089bb..d5ae039 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -26,6 +26,7 @@
 #include "../templates/attachment.ctt"
 #include "../templates/emoji.ctt"
 #include "../templates/postbox.ctt"
+#include "../templates/timeline.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -42,6 +43,7 @@ void init_template_files()
     hv_stores(template_files, "attachment.tt", newSVpv(data_attachment_tt, data_attachment_tt_size));
     hv_stores(template_files, "emoji.tt", newSVpv(data_emoji_tt, data_emoji_tt_size));
     hv_stores(template_files, "postbox.tt", newSVpv(data_postbox_tt, data_postbox_tt_size));
+    hv_stores(template_files, "timeline.tt", newSVpv(data_timeline_tt, data_timeline_tt_size);)
 }
 
 void cleanup_template_files()
diff --git a/src/status.c b/src/status.c
index fb1998e..83b6173 100644
--- a/src/status.c
+++ b/src/status.c
@@ -947,7 +947,7 @@ void content_status(PATH_ARGS, uint8_t flags)
     SAVETMPS;
     PUSHMARK(SP);
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_inc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_status(&status)));
     if (statuses_before)
diff --git a/templates/timeline.tt b/templates/timeline.tt
new file mode 100644
index 0000000..bd8704f
--- /dev/null
+++ b/templates/timeline.tt
@@ -0,0 +1,14 @@
+<div class="menubar">
+  <form action="." method="post">
+    Only media:
+    <input type="checkbox" name="only_media" value="1" [% ssn.post.only_media %]>
+    <span class="bullet-separate">&bull;</span>
+    Replies: 
+    <select name="replies_only">
+      <option value="0">Show replies</option>
+      <option value="1">Self</option>
+      <option value="2">Following</option>
+    </select>
+    <input type="submit" value="Filter">
+  </form>
+</div>

From 473b3b592082624c68adc552b941502903b2c5be Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 04:31:28 +0000
Subject: [PATCH 033/143] Progress

FossilOrigin-Name: 69b265f1adaa240d8ec99f3448ed386a9e543e4f30cf1534cb387c57ee198a4d
---
 perl/timeline.pm      |  4 ++++
 src/global_perl.c     |  2 +-
 src/status.c          | 10 +++++-----
 src/timeline.c        | 18 +++++++++---------
 templates/timeline.tt | 10 ++++++++++
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/perl/timeline.pm b/perl/timeline.pm
index 482916b..6e86a2f 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -7,6 +7,8 @@ our @EXPORT = qw( generate_attachment );
 
 use template_helpers 'to_template';
 use icons 'get_icon';
+use postbox 'generate_postbox';
+use status 'generate_status';
 
 sub content_timeline
 {
@@ -18,6 +20,8 @@ sub content_timeline
         statuses => $statuses,
         title => $title,
         show_post_box => $show_post_box,
+        postbox => \&postbox,
+        create_status => \&generate_status,
         );
 
     to_template(\&vars, \&data->{'timeline.tt'});
diff --git a/src/global_perl.c b/src/global_perl.c
index d5ae039..1cd1039 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -43,7 +43,7 @@ void init_template_files()
     hv_stores(template_files, "attachment.tt", newSVpv(data_attachment_tt, data_attachment_tt_size));
     hv_stores(template_files, "emoji.tt", newSVpv(data_emoji_tt, data_emoji_tt_size));
     hv_stores(template_files, "postbox.tt", newSVpv(data_postbox_tt, data_postbox_tt_size));
-    hv_stores(template_files, "timeline.tt", newSVpv(data_timeline_tt, data_timeline_tt_size);)
+    hv_stores(template_files, "timeline.tt", newSVpv(data_timeline_tt, data_timeline_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/status.c b/src/status.c
index 83b6173..e93ead7 100644
--- a/src/status.c
+++ b/src/status.c
@@ -947,16 +947,16 @@ void content_status(PATH_ARGS, uint8_t flags)
     SAVETMPS;
     PUSHMARK(SP);
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_status(&status)));
+    XPUSHs(newRV_inc((SV*)session_hv));
+    XPUSHs(newRV_inc((SV*)template_files));
+    XPUSHs(newRV_inc((SV*)perlify_status(&status)));
     if (statuses_before)
-        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_before, stat_before_len)));
+        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_before, stat_before_len)));
     else
         XPUSHs(&PL_sv_undef);
     
     if (statuses_after)
-        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_after, stat_after_len)));
+        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_after, stat_after_len)));
     else
         XPUSHs(&PL_sv_undef);
     // ARGS
diff --git a/src/timeline.c b/src/timeline.c
index 0962d86..9dc1d10 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -30,7 +30,7 @@
 #include "query.h"
 #include "error.h"
 #include "string_helpers.h"
-#include "perl_global.h"
+#include "global_perl.h"
 
 #include "../static/timeline_options.ctmpl"
 #include "../static/navigation.ctmpl"
@@ -51,21 +51,21 @@ void content_timeline(FCGX_Request* req,
     SAVETMPS;
     PUSHMARK(SP);
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_inc((SV*)session_hv));
+    XPUSHs(newRV_inc((SV*)template_files));
     
     if (statuses)
-        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses, statuses_len)));
-    else ARG_UNDEFINED();
+        XPUSHs(newRV_inc((SV*)perlify_statuses(statuses, statuses_len)));
+    else { ARG_UNDEFINED(); }
 
-    if (title)
+    if (header_text)
         XPUSHs(newSVpv(header_text, 0));
-    else ARG_UNDEFINED();
+    else { ARG_UNDEFINED(); }
 
     XPUSHi(show_post_box);
 
     PUTBACK;
-    call_pv("status::content_timeline", G_SCALAR);
+    call_pv("timeline::content_timeline", G_SCALAR);
     SPAGAIN;
 
     // Duplicate to free temps
@@ -78,7 +78,7 @@ void content_timeline(FCGX_Request* req,
     
     struct base_page b = {
         .category = cat,
-        .content = output,
+        .content = dup,
         .session = session_hv,
         .sidebar_left = NULL
     };
diff --git a/templates/timeline.tt b/templates/timeline.tt
index bd8704f..0c2c4e9 100644
--- a/templates/timeline.tt
+++ b/templates/timeline.tt
@@ -1,3 +1,7 @@
+[% IF show_post_box %]
+    [% postbox(ssn, data, undef) %]
+[% END %]
+
 <div class="menubar">
   <form action="." method="post">
     Only media:
@@ -12,3 +16,9 @@
     <input type="submit" value="Filter">
   </form>
 </div>
+
+[% FOREACH i IN statuses %]
+    [% create_status(ssn, data, i) %]
+[% END %]
+
+[%# TODO navigation %]

From 6ab40c0a66a59635f2f7349ca2430d54d445560f Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 04:49:28 +0000
Subject: [PATCH 034/143] lmao

FossilOrigin-Name: ce623bcfc6aa85e250f8861966654b8c476372c1829d14d96b4b80bbd799a34c
---
 perl/main.pl      |  1 +
 perl/timeline.pm  |  3 ++-
 src/global_perl.h |  6 +++---
 src/status.c      | 10 +++++-----
 src/timeline.c    | 12 ++++++------
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/perl/main.pl b/perl/main.pl
index 0f01c9e..14ff2d1 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -5,6 +5,7 @@ use Template;
 use l10n qw( &lang %L10N );
 use notifications qw( generate_notification_compact );
 use template_helpers qw( &to_template );
+use timeline;
 use status;
 
 # my $template = Template->new(
diff --git a/perl/timeline.pm b/perl/timeline.pm
index 6e86a2f..30a517c 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( generate_attachment );
+our @EXPORT = qw( content_timeline );
 
 use template_helpers 'to_template';
 use icons 'get_icon';
@@ -17,6 +17,7 @@ sub content_timeline
     my %vars = (
         prefix => '',
         ssn => $ssn,
+        data => $data,
         statuses => $statuses,
         title => $title,
         show_post_box => $show_post_box,
diff --git a/src/global_perl.h b/src/global_perl.h
index bbe8a8a..f6cfb85 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -32,10 +32,10 @@ static PerlInterpreter* perl;
 extern HV* template_files;
 extern pthread_mutex_t perl_mutex;
 
-#define perl_lock() do { pthread_mutex_lock(&perl_mutex); } while (1)
-#define perl_unlock() do { pthread_mutex_unlock(&perl_mutex); } while (1)
+#define perl_lock() do { pthread_mutex_lock(&perl_mutex); } while (0)
+#define perl_unlock() do { pthread_mutex_unlock(&perl_mutex); } while (0)
 
-#define ARG_UNDEFINED() do { XPUSHs(&PL_sv_undef); } while (1)
+#define ARG_UNDEFINED() do { XPUSHs(&PL_sv_undef); } while (0)
 
 void init_template_files();
 void cleanup_template_files();
diff --git a/src/status.c b/src/status.c
index e93ead7..83b6173 100644
--- a/src/status.c
+++ b/src/status.c
@@ -947,16 +947,16 @@ void content_status(PATH_ARGS, uint8_t flags)
     SAVETMPS;
     PUSHMARK(SP);
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_inc((SV*)session_hv));
-    XPUSHs(newRV_inc((SV*)template_files));
-    XPUSHs(newRV_inc((SV*)perlify_status(&status)));
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_status(&status)));
     if (statuses_before)
-        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_before, stat_before_len)));
+        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_before, stat_before_len)));
     else
         XPUSHs(&PL_sv_undef);
     
     if (statuses_after)
-        XPUSHs(newRV_inc((AV*)perlify_statuses(statuses_after, stat_after_len)));
+        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_after, stat_after_len)));
     else
         XPUSHs(&PL_sv_undef);
     // ARGS
diff --git a/src/timeline.c b/src/timeline.c
index 9dc1d10..3a0aa59 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -51,18 +51,18 @@ void content_timeline(FCGX_Request* req,
     SAVETMPS;
     PUSHMARK(SP);
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_inc((SV*)session_hv));
-    XPUSHs(newRV_inc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
     
     if (statuses)
-        XPUSHs(newRV_inc((SV*)perlify_statuses(statuses, statuses_len)));
-    else { ARG_UNDEFINED(); }
+        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
+    else ARG_UNDEFINED();
 
     if (header_text)
         XPUSHs(newSVpv(header_text, 0));
-    else { ARG_UNDEFINED(); }
+    else ARG_UNDEFINED();
 
-    XPUSHi(show_post_box);
+    mXPUSHi(show_post_box);
 
     PUTBACK;
     call_pv("timeline::content_timeline", G_SCALAR);

From 50b0404c51cad27c22ff256178f7a8114c4838f6 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 05:00:13 +0000
Subject: [PATCH 035/143] Fix timelines

FossilOrigin-Name: db1f2c1597a362e40bc65c39daf079ee51091bba653e721a9ac4e918bad95d61
---
 perl/postbox.pm      |  3 +++
 perl/timeline.pm     |  4 ++--
 src/timeline.c       |  2 --
 templates/postbox.tt | 16 ++++++++--------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/perl/postbox.pm b/perl/postbox.pm
index a7c1e19..35e6475 100644
--- a/perl/postbox.pm
+++ b/perl/postbox.pm
@@ -7,6 +7,8 @@ use Exporter 'import';
 
 our @EXPORT = qw( generate_postbox );
 
+use icons 'get_icon';
+
 sub generate_postbox
 {
     my ($ssn, $data, $status) = @_;
@@ -16,6 +18,7 @@ sub generate_postbox
         ssn => $ssn,
         data => $data,
         status => $status,
+        icon => \&get_icon,
         mentionify => \&get_mentions_from_content,
         );
 
diff --git a/perl/timeline.pm b/perl/timeline.pm
index 30a517c..45d65ab 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -21,9 +21,9 @@ sub content_timeline
         statuses => $statuses,
         title => $title,
         show_post_box => $show_post_box,
-        postbox => \&postbox,
+        postbox => \&generate_postbox,
         create_status => \&generate_status,
         );
 
-    to_template(\&vars, \&data->{'timeline.tt'});
+    to_template(\%vars, \$data->{'timeline.tt'});
 }
diff --git a/src/timeline.c b/src/timeline.c
index 3a0aa59..575d3f9 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -45,7 +45,6 @@ void content_timeline(FCGX_Request* req,
                       char* header_text,
                       int show_post_box)
 {
-    perl_lock();
     dSP;
     ENTER;
     SAVETMPS;
@@ -74,7 +73,6 @@ void content_timeline(FCGX_Request* req,
     PUTBACK;
     FREETMPS;
     LEAVE;
-    perl_unlock();
     
     struct base_page b = {
         .category = cat,
diff --git a/templates/postbox.tt b/templates/postbox.tt
index 46b4c06..f55e122 100644
--- a/templates/postbox.tt
+++ b/templates/postbox.tt
@@ -22,7 +22,7 @@
                     <!-- Local -->
                     <label>
                         <input type="radio" name="visibility" value="local" class="hidden"
-                               [%- IF status.visibility == 6 %] checked[% END %]>
+                               [%- IF status && status.visibility == 6 %] checked[% END %]>
                         <div class="visibility-icon vis-local">
                             [% icon('local') %]
                         </div>
@@ -30,7 +30,7 @@
                     <!-- Direct -->
                     <label>
                         <input type="radio" name="visibility" value="direct" class="hidden"
-                               [%- IF status.visibility == 5 %] checked[% END %]>
+                               [%- IF status && status.visibility == 5 %] checked[% END %]>
                         <div class="visibility-icon vis-direct">
                             [% icon('direct') %]
                         </div>
@@ -38,8 +38,8 @@
                     <!-- Private -->
                     <label>
                         <input type="radio" name="visibility" value="private" class="hidden"
-                               [%- IF status.visibility == 3 %] checked[% END %]
-                               [%- IF status.visibility > 3 %] disabled[% END %]>
+                               [%- IF status && status.visibility == 3 %] checked[% END %]
+                               [%- IF status && status.visibility > 3 %] disabled[% END %]>
                         <div class="visibility-icon vis-private">
                             [% icon('private') %]
                         </div>
@@ -47,8 +47,8 @@
                     <!-- Unlisted -->
                     <label>
                         <input type="radio" name="visibility" value="unlisted" class="hidden"
-                               [%- IF status.visibility == 2 %] checked[% END %]
-                               [%- IF status.visibility > 2 %] disabled[% END %]>
+                               [%- IF status && status.visibility == 2 %] checked[% END %]
+                               [%- IF status && status.visibility > 2 %] disabled[% END %]>
                         <div class="visibility-icon vis-unlisted">
                             [% icon('unlisted') %]
                         </div>
@@ -56,8 +56,8 @@
                     <!-- Public -->
                     <label>
                         <input type="radio" name="visibility" value="public" class="hidden"
-                               [%- IF status.visibility == 1 %] checked[% END %]
-                               [%- IF status.visibility > 2 %] disabled[% END %]>
+                               [%- IF status && status.visibility == 1 %] checked[% END %]
+                               [%- IF status && status.visibility > 2 %] disabled[% END %]>
                         <div class="visibility-icon vis-public">
                             [% icon('public') %]
                         </div>

From e002975c7554f10403fac8b512fd89c6d035bc07 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 16:17:59 +0000
Subject: [PATCH 036/143] Template files and stuff

FossilOrigin-Name: 7b78c4539633a22909aa1d3d3c86d10d83897ee9e4db0796562fa290c34eb657
---
 perl/account.pm                | 35 ++++++++++++++++++++++++++++++++++
 src/account.c                  |  1 +
 src/global_perl.c              |  7 +++++++
 templates/account.tt           |  3 +++
 templates/account_scrobbles.tt |  1 +
 templates/account_statuses.tt  |  1 +
 6 files changed, 48 insertions(+)
 create mode 100644 perl/account.pm
 create mode 100644 templates/account.tt
 create mode 100644 templates/account_scrobbles.tt
 create mode 100644 templates/account_statuses.tt

diff --git a/perl/account.pm b/perl/account.pm
new file mode 100644
index 0000000..35057a0
--- /dev/null
+++ b/perl/account.pm
@@ -0,0 +1,35 @@
+package account;
+use strict;
+use warnings;
+
+use Exporter 'import';
+
+our @EXPORT = qw( generate_attachment );
+
+use template_helpers 'to_template';
+
+sub account
+{
+    my ($ssn, $data, $acct, $content) = @_;
+
+    my %vars = (
+        prefix = '',
+        ssn => $ssn,
+        content => $content,
+        );
+
+    to_template(\%vars, \$data->{'account.tt'});
+}
+
+sub content_account_statuses
+{
+    my ($ssn, $data, $acct, $statuses) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        acct => $acct,
+        );
+
+    account($ssn, $data, $acct, to_template(\%vars, \$data->{'account_statuses.tt'}));
+}
diff --git a/src/account.c b/src/account.c
index 06290d7..dd2a046 100644
--- a/src/account.c
+++ b/src/account.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include "global_perl.h"
 #include "helpers.h"
 #include "base_page.h"
 #include "error.h"
diff --git a/src/global_perl.c b/src/global_perl.c
index 1cd1039..8233096 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -18,6 +18,7 @@
 
 #include "global_perl.h"
 
+/* TODO let's generate this file dynamically with a Perl script? */
 #include "../templates/main.ctt"
 #include "../templates/notif_compact.ctt"
 #include "../templates/status.ctt"
@@ -27,6 +28,9 @@
 #include "../templates/emoji.ctt"
 #include "../templates/postbox.ctt"
 #include "../templates/timeline.ctt"
+#include "../templates/account.ctt"
+#include "../templates/account_statuses.ctt"
+#include "../templates/account_scrobbles.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -44,6 +48,9 @@ void init_template_files()
     hv_stores(template_files, "emoji.tt", newSVpv(data_emoji_tt, data_emoji_tt_size));
     hv_stores(template_files, "postbox.tt", newSVpv(data_postbox_tt, data_postbox_tt_size));
     hv_stores(template_files, "timeline.tt", newSVpv(data_timeline_tt, data_timeline_tt_size));
+    hv_stores(template_files, "account.tt", newSVpv(data_account_tt, data_account_tt_size));
+    hv_stores(template_files, "account_statuses.tt", newSVpv(data_account_statuses_tt, data_account_statuses_tt_size));
+    hv_stores(template_files, "account_scrobbles.tt", newSVpv(data_account_scrobbles_tt, data_account_scrobbles_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/templates/account.tt b/templates/account.tt
new file mode 100644
index 0000000..872571a
--- /dev/null
+++ b/templates/account.tt
@@ -0,0 +1,3 @@
+account
+
+[% content %]
diff --git a/templates/account_scrobbles.tt b/templates/account_scrobbles.tt
new file mode 100644
index 0000000..5f5622d
--- /dev/null
+++ b/templates/account_scrobbles.tt
@@ -0,0 +1 @@
+Scrobbles
diff --git a/templates/account_statuses.tt b/templates/account_statuses.tt
new file mode 100644
index 0000000..50d925c
--- /dev/null
+++ b/templates/account_statuses.tt
@@ -0,0 +1 @@
+Account statuses

From bbe47e872107e081c263d2578304c7035b3692a2 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 4 Aug 2022 17:48:22 +0000
Subject: [PATCH 037/143] Fix fetch_account_page

FossilOrigin-Name: 177ff656f354a699a830082adf54ad723c043f25af955f91c80355e3f9a8019e
---
 src/account.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/account.c b/src/account.c
index dd2a046..3adcfec 100644
--- a/src/account.c
+++ b/src/account.c
@@ -308,8 +308,6 @@ static void fetch_account_page(FCGX_Request* req,
                                enum account_tab tab,
                                char* (*callback)(struct session* ssn, mastodont_t* api, struct mstdnt_account* acct, void* args))
 {
-    char* account_page;
-    char* data;
     struct mstdnt_storage storage = { 0 },
         relations_storage = { 0 };
     struct mstdnt_account acct = { 0 };
@@ -320,32 +318,16 @@ static void fetch_account_page(FCGX_Request* req,
 
     int lookup_type = config_experimental_lookup ? MSTDNT_LOOKUP_ACCT : MSTDNT_LOOKUP_ID;
     
-    if (mastodont_get_account(api, &m_args, lookup_type, id, &acct, &storage))
-    {
-        account_page = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        // Relationships may fail
-        mastodont_get_relationships(api, &m_args, &(acct.id), 1, &relations_storage, &relationships, &relationships_len);
+    mastodont_get_account(api, &m_args, lookup_type, id, &acct, &storage);
+    // Relationships may fail
+    mastodont_get_relationships(api, &m_args, &(acct.id), 1, &relations_storage, &relationships, &relationships_len);
         
-        data = callback(ssn, api, 
-                        &acct, args);
-        account_page = load_account_page(ssn,
-                                         api,
-                                         &acct,
-                                         relationships,
-                                         tab,
-                                         data,
-                                         NULL);
-        if (!account_page)
-            account_page = construct_error("Couldn't load page", E_ERROR, 1, NULL);
-        
-        free(data);
-    }
+    data = callback(ssn, api, &acct, args);
 
     struct base_page b = {   
         .category = BASE_CAT_NONE,
         .content = account_page,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
@@ -825,7 +807,7 @@ void content_account_favourites(PATH_ARGS)
     char* start_id;
 
     struct mstdnt_favourites_args args = {
-        .max_id = keystr(ssn->post.max_id),
+
         .min_id = keystr(ssn->post.min_id),
         .limit = 20,
     };

From 637e1591d201cb1b5117f4f4faeb696644f3a509 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 00:16:59 +0000
Subject: [PATCH 038/143] Call account::content_statuses

FossilOrigin-Name: f84703f24f566b1e246844dd63b708c40683fad58f95ddefcd1771e460da51a6
---
 src/account.c | 99 ++++++++++++++++++++++++++++++++-------------------
 src/status.c  |  8 ++---
 2 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/src/account.c b/src/account.c
index 3adcfec..106ed9a 100644
--- a/src/account.c
+++ b/src/account.c
@@ -107,9 +107,11 @@ char* construct_account_sidebar(struct mstdnt_account* acct, size_t* size)
 }
 
 // TODO put account stuff into one function to cleanup a bit
-static char* account_followers_cb(struct session* ssn,
+static char* account_followers_cb(HV* hv_session,
+                                  struct session* ssn,
                                   mastodont_t* api,
                                   struct mstdnt_account* acct,
+                                  struct mstdnt_relationship* rel, 
                                   void* _args)
 {
     struct mstdnt_account_args args = {
@@ -159,9 +161,11 @@ static char* account_followers_cb(struct session* ssn,
     return output;
 }
 
-static char* account_following_cb(struct session* ssn,
+static char* account_following_cb(HV* hv_session,
+                                  struct session* ssn,
                                   mastodont_t* api,
                                   struct mstdnt_account* acct,
+                                  struct mstdnt_relationship* rel, 
                                   void* _args)
 {
     struct mstdnt_account_args args = {
@@ -211,54 +215,62 @@ static char* account_following_cb(struct session* ssn,
     return output;    
 }
 
-static char* account_statuses_cb(struct session* ssn,
+static char* account_statuses_cb(HV* session_hv,
+                                 struct session* ssn,
                                  mastodont_t* api,
                                  struct mstdnt_account* acct,
+                                 struct mstdnt_relationship* rel, 
                                  void* _args)
 
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
     struct mstdnt_account_statuses_args* args = _args;
-    char* statuses_html = NULL, *navigation_box = NULL;
-    char* output;
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_status* statuses = NULL;
     size_t statuses_len = 0;
-    char* start_id;
+    char* result;
     
-    if (mastodont_get_account_statuses(api, &m_args, acct->id, args, &storage, &statuses, &statuses_len))
-    {
-        statuses_html = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        statuses_html = construct_statuses(ssn, api, statuses, statuses_len, NULL, NULL);
-        if (!statuses_html)
-            statuses_html = construct_error("No statuses", E_NOTICE, 1, NULL);
-    }
+    mastodont_get_account_statuses(api, &m_args, acct->id, args, &storage, &statuses, &statuses_len);
 
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
     if (statuses)
-    {
-        // If not set, set it
-        start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : statuses[0].id;
-        navigation_box = construct_navigation_box(start_id,
-                                                  statuses[0].id,
-                                                  statuses[statuses_len-1].id,
-                                                  NULL);
-    }
-    easprintf(&output, "%s%s",
-              STR_NULL_EMPTY(statuses_html),
-              STR_NULL_EMPTY(navigation_box));
+        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
+    else ARG_UNDEFINED();
+
+    PUTBACK;
+    call_pv("account::content_statuses", G_SCALAR);
+    SPAGAIN;
+    
+    result = savesharedsvpv(POPs);
+    
+    // Clean up Perl
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     mastodont_storage_cleanup(&storage);
     mstdnt_cleanup_statuses(statuses, statuses_len);
-    if (statuses_html) free(statuses_html);
-    if (navigation_box) free(navigation_box);
-    return output;
+    
+    return result;
 }
 
 
-static char* account_scrobbles_cb(struct session* ssn, mastodont_t* api, struct mstdnt_account* acct, void* _args)
+static char* account_scrobbles_cb(HV* session_hv,
+                                  struct session* ssn,
+                                  mastodont_t* api,
+                                  struct mstdnt_account* acct,
+                                  struct mstdnt_relationship* rel, 
+                                  void* _args)
 {
     (void)_args;
     char* scrobbles_html = NULL;
@@ -300,13 +312,26 @@ void get_account_info(mastodont_t* api, struct session* ssn)
     }
 }
 
+/**
+ * Fetches the account information, and then calls a callback on the information received which
+ * passes the account information
+ *
+ * @param req The request context
+ * @param ssn The session, which will get transcribed into Perl
+ * @param api Initiated mstdnt API
+ * @param id User's ID to fetch
+ * @param args The arguments to pass into the callback
+ * @param tab Current tab to focus
+ * @param callback Calls back with a perlified session, session and api as you passed in, the account,
+ *                 the relationship, and additional arguments passed
+ */
 static void fetch_account_page(FCGX_Request* req,
                                struct session* ssn,
                                mastodont_t* api,
                                char* id,
                                void* args,
                                enum account_tab tab,
-                               char* (*callback)(struct session* ssn, mastodont_t* api, struct mstdnt_account* acct, void* args))
+                               char* (*callback)(HV* ssn_hv, struct session* ssn, mastodont_t* api, struct mstdnt_account* acct, struct mstdnt_relationship* rel, void* args))
 {
     struct mstdnt_storage storage = { 0 },
         relations_storage = { 0 };
@@ -321,12 +346,14 @@ static void fetch_account_page(FCGX_Request* req,
     mastodont_get_account(api, &m_args, lookup_type, id, &acct, &storage);
     // Relationships may fail
     mastodont_get_relationships(api, &m_args, &(acct.id), 1, &relations_storage, &relationships, &relationships_len);
-        
-    data = callback(ssn, api, &acct, args);
 
-    struct base_page b = {   
+    HV* session_hv = perlify_session(ssn);
+    
+    char* data = callback(session_hv, ssn, api, &acct, relationships, args);
+
+    struct base_page b = {
         .category = BASE_CAT_NONE,
-        .content = account_page,
+        .content = data,
         .session = session_hv,
         .sidebar_left = NULL
     };
@@ -338,7 +365,7 @@ static void fetch_account_page(FCGX_Request* req,
     mstdnt_cleanup_relationships(relationships);
     mastodont_storage_cleanup(&storage);
     mastodont_storage_cleanup(&relations_storage);
-    free(account_page);
+    Safefree(data);
 }
 
 size_t construct_account_page(struct session* ssn,
diff --git a/src/status.c b/src/status.c
index 83b6173..fc99646 100644
--- a/src/status.c
+++ b/src/status.c
@@ -951,14 +951,14 @@ void content_status(PATH_ARGS, uint8_t flags)
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_status(&status)));
     if (statuses_before)
-        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_before, stat_before_len)));
+        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_before, stat_before_len)));
     else
-        XPUSHs(&PL_sv_undef);
+        ARG_UNDEFINED();
     
     if (statuses_after)
-        XPUSHs(newRV_noinc((AV*)perlify_statuses(statuses_after, stat_after_len)));
+        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_after, stat_after_len)));
     else
-        XPUSHs(&PL_sv_undef);
+        ARG_UNDEFINED();
     // ARGS
     PUTBACK;
     call_pv("status::content_status", G_SCALAR);

From 72f89321550647c5785e4d639462bb2612849407 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 01:26:57 +0000
Subject: [PATCH 039/143] Fix account subroutines

FossilOrigin-Name: 11a7cb02e4b0b669445fe1bb6330026b1fa01764008e917a417476b8f8d274c9
---
 perl/account.pm | 10 +++++-----
 perl/main.pl    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/perl/account.pm b/perl/account.pm
index 35057a0..2a0bb71 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -4,16 +4,16 @@ use warnings;
 
 use Exporter 'import';
 
-our @EXPORT = qw( generate_attachment );
+our @EXPORT = qw( account content_statuses );
 
 use template_helpers 'to_template';
 
-sub account
+sub generate_account
 {
     my ($ssn, $data, $acct, $content) = @_;
 
     my %vars = (
-        prefix = '',
+        prefix => '',
         ssn => $ssn,
         content => $content,
         );
@@ -21,7 +21,7 @@ sub account
     to_template(\%vars, \$data->{'account.tt'});
 }
 
-sub content_account_statuses
+sub content_statuses
 {
     my ($ssn, $data, $acct, $statuses) = @_;
 
@@ -31,5 +31,5 @@ sub content_account_statuses
         acct => $acct,
         );
 
-    account($ssn, $data, $acct, to_template(\%vars, \$data->{'account_statuses.tt'}));
+    generate_account($ssn, $data, $acct, to_template(\%vars, \$data->{'account_statuses.tt'}));
 }
diff --git a/perl/main.pl b/perl/main.pl
index 14ff2d1..d672903 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -7,6 +7,7 @@ use notifications qw( generate_notification_compact );
 use template_helpers qw( &to_template );
 use timeline;
 use status;
+use account;
 
 # my $template = Template->new(
 #     {

From 6ea891ae8b0470c24af11a65a663526ee0ae690a Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 04:01:03 +0000
Subject: [PATCH 040/143] Perlify relationship

FossilOrigin-Name: 08437db1c8a6eae47804c4687a67c5522b2b98b7464cc089229bf07fbbd8880a
---
 perl/account.pm      |  5 ++--
 src/account.c        | 25 ++++++++++++++++
 src/account.h        |  1 +
 templates/account.tt | 69 ++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/perl/account.pm b/perl/account.pm
index 2a0bb71..04e36a6 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -16,6 +16,7 @@ sub generate_account
         prefix => '',
         ssn => $ssn,
         content => $content,
+        acct => $acct,
         );
 
     to_template(\%vars, \$data->{'account.tt'});
@@ -23,7 +24,7 @@ sub generate_account
 
 sub content_statuses
 {
-    my ($ssn, $data, $acct, $statuses) = @_;
+    my ($ssn, $data, $acct, $relationships, $statuses) = @_;
 
     my %vars = (
         prefix => '',
@@ -31,5 +32,5 @@ sub content_statuses
         acct => $acct,
         );
 
-    generate_account($ssn, $data, $acct, to_template(\%vars, \$data->{'account_statuses.tt'}));
+    generate_account($ssn, $data, $acct, $relationships, to_template(\%vars, \$data->{'account_statuses.tt'}));
 }
diff --git a/src/account.c b/src/account.c
index 106ed9a..86c84ad 100644
--- a/src/account.c
+++ b/src/account.c
@@ -242,6 +242,10 @@ static char* account_statuses_cb(HV* session_hv,
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    if (rel)
+        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+    else ARG_UNDEFINED();
+    
     if (statuses)
         XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
     else ARG_UNDEFINED();
@@ -914,3 +918,24 @@ HV* perlify_account(const struct mstdnt_account* acct)
     
     return acct_hv;
 }
+
+HV* perlify_relationship(const struct mstdnt_relationship* rel)
+{
+    if (!rel) return NULL;
+    HV* rel_hv = newHV();
+
+    hvstores_str(rel_hv, "id", rel->id);
+    hvstores_int(rel_hv, "following", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_FOLLOWING));
+    hvstores_int(rel_hv, "requested", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_REQUESTED));
+    hvstores_int(rel_hv, "endoresed", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_ENDORSED));
+    hvstores_int(rel_hv, "followed_by", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_FOLLOWED_BY));
+    hvstores_int(rel_hv, "muting", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_MUTING));
+    hvstores_int(rel_hv, "muting_notifs", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_MUTING_NOTIFS));
+    hvstores_int(rel_hv, "showing_reblogs", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_SHOWING_REBLOGS));
+    hvstores_int(rel_hv, "notifying", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_NOTIFYING));
+    hvstores_int(rel_hv, "blocking", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_BLOCKING));
+    hvstores_int(rel_hv, "domain_blocking", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_DOMAIN_BLOCKING));
+    hvstores_str(rel_hv, "blocked_by", rel->id);
+
+    return rel_hv;
+}
diff --git a/src/account.h b/src/account.h
index 1cbed18..3de5779 100644
--- a/src/account.h
+++ b/src/account.h
@@ -98,5 +98,6 @@ void content_account_favourites(PATH_ARGS);
 void content_account_bookmarks(PATH_ARGS);
 
 HV* perlify_account(const struct mstdnt_account* acct);
+HV* perlify_relationship(const struct mstdnt_relationship* rel);
 
 #endif // ACCOUNT_H
diff --git a/templates/account.tt b/templates/account.tt
index 872571a..24ba858 100644
--- a/templates/account.tt
+++ b/templates/account.tt
@@ -1,3 +1,68 @@
-account
+{{%s:is_blocked}}
+{{%s:menubar}}
+<div class="account">
+  <div class="acct-banner" style="background-image:url('{{%s:header}}');">
+    {{%s:follows_you}}
+    <div class="acct-info-data">
+      <span class="acct-displayname">{{%s:display_name}}</span>
+      <span class="acct-username">{{%s:acct}}</span>
+    </div>
+
+    <span class="menu-container user-options-btn">
+      Menu
+      <div class="menu menu-options">
+        <ul>
+          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unsubscribe}}subscribe"><input class="btn-menu" type="button" value="{{%s:subscribe_text}}"></a></li>
+          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unblock}}block"><input class="btn-menu" type="button" value="{{%s:block_text}}"></a></li>
+          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unmute}}mute"><input class="btn-menu" type="button" value="{{%s:mute_text}}"></a></li>
+        </ul>
+      </div>
+    </span>
+  </div>
+  
+  <div class="acct-header">
+    <a href="{{%s:prefix}}/@{{%s:acct}}" class="header-btn btn">
+      <span class="btn-header">{{%s:tab_statuses_text}}</span>
+      <span class="btn-content">{{%d:statuses_count}}</span>
+    </a>
+    
+    <a href="{{%s:prefix}}/@{{%s:acct}}/following" class="header-btn btn">
+      <span class="btn-header">{{%s:tab_following_text}}</span>
+      <span class="btn-content">{{%d:following_count}}</span>
+    </a>
+
+    <a href="{{%s:prefix}}/@{{%s:acct}}/followers" class="header-btn btn">
+      <span class="btn-header">{{%s:tab_followers_text}}</span>
+      <span class="btn-content">{{%d:followers_count}}</span>
+    </a>
+    
+    {{%s:follow_btn}}
+  </div>
+  <div class="acct-pfp-wrapper">
+    <img class="acct-pfp" src="{{%s:avatar}}">
+  </div>
+</div>
+
+{{%s:info}}
+
+<table class="tabs ui-table">
+  <tr>
+    <td>
+      <a href="{{%s:prefix}}/@{{%s:acct}}/statuses"><input class="tab-btn btn {{%s:tab_statuses_focused}}" type="button" value="{{%s:tab_statuses_text}}"></a>
+    </td>
+    <td>
+      <a href="{{%s:prefix}}/@{{%s:acct}}/scrobbles"><input class="tab-btn btn {{%s:tab_scrobbles_focused}}" type="button" value="{{%s:tab_scrobbles_text}}"></a>
+    </td>
+    <td>
+      <a href="{{%s:prefix}}/@{{%s:acct}}/media"><input class="tab-btn btn {{%s:tab_media_focused}}" type="button" value="{{%s:tab_media_text}}"></a>
+    </td>
+    <td>
+      <a href="{{%s:prefix}}/@{{%s:acct}}/pinned"><input class="tab-btn btn {{%s:tab_pinned_focused}}" type="button" value="{{%s:tab_pinned_text}}"></a>
+    </td>
+  </tr>
+</table>
+
+<div class="account-content">
+  {{%s:acct_content}}
+</div>
 
-[% content %]

From 388f4fadf40275a3c8bcded95a2f6d96efc1a005 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 04:31:51 +0000
Subject: [PATCH 041/143] Account template

FossilOrigin-Name: 8b23951e351627eddbb3a4520c4fe43015955ec4b32621416b6e144d6086a1e4
---
 perl/account.pm      |   7 +--
 templates/account.tt | 126 ++++++++++++++++++++++++-------------------
 2 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/perl/account.pm b/perl/account.pm
index 04e36a6..981e016 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -10,11 +10,12 @@ use template_helpers 'to_template';
 
 sub generate_account
 {
-    my ($ssn, $data, $acct, $content) = @_;
+    my ($ssn, $data, $acct, $relationship, $content) = @_;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
+        relationship => $relationship,
         content => $content,
         acct => $acct,
         );
@@ -24,7 +25,7 @@ sub generate_account
 
 sub content_statuses
 {
-    my ($ssn, $data, $acct, $relationships, $statuses) = @_;
+    my ($ssn, $data, $acct, $relationship, $statuses) = @_;
 
     my %vars = (
         prefix => '',
@@ -32,5 +33,5 @@ sub content_statuses
         acct => $acct,
         );
 
-    generate_account($ssn, $data, $acct, $relationships, to_template(\%vars, \$data->{'account_statuses.tt'}));
+    generate_account($ssn, $data, $acct, $relationship, to_template(\%vars, \$data->{'account_statuses.tt'}));
 }
diff --git a/templates/account.tt b/templates/account.tt
index 24ba858..78435d5 100644
--- a/templates/account.tt
+++ b/templates/account.tt
@@ -1,68 +1,84 @@
-{{%s:is_blocked}}
-{{%s:menubar}}
-<div class="account">
-  <div class="acct-banner" style="background-image:url('{{%s:header}}');">
-    {{%s:follows_you}}
-    <div class="acct-info-data">
-      <span class="acct-displayname">{{%s:display_name}}</span>
-      <span class="acct-username">{{%s:acct}}</span>
+[% IF relationship && relationship.blocked_by %]
+    <span class="e-notice">You are blocked by this user. You can still interact, but they will not be notifed of your interactions.</span>
+[% END %]
+[% IF acct.id == ssn.account.id %]
+    <div class="menubar">
+        <a href="{{%s:prefix}}/blocked">{{ %s : blocked_str }}</a>
+        <span class="bullet-separate">&bull;</span>
+        <a href="{{%s:prefix}}/muted">{{ %s : muted_str }}</a>
+        <span class="bullet-separate">&bull;</span>
+        <a href="{{%s:prefix}}/favourites">{{ %s : favourited_str }}</a>
     </div>
+[% END %]
+<div class="account">
+    <div class="acct-banner" style="background-image:url('[% acct.header %]');">
+        [% IF relationship && relationship.following %]
+            
+        [% END %]
+        <div class="acct-info-data">
+            <span class="acct-displayname">[% acct.display_name %]</span>
+            <span class="acct-username">@[% acct.acct %]</span>
+        </div>
 
-    <span class="menu-container user-options-btn">
-      Menu
-      <div class="menu menu-options">
-        <ul>
-          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unsubscribe}}subscribe"><input class="btn-menu" type="button" value="{{%s:subscribe_text}}"></a></li>
-          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unblock}}block"><input class="btn-menu" type="button" value="{{%s:block_text}}"></a></li>
-          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unmute}}mute"><input class="btn-menu" type="button" value="{{%s:mute_text}}"></a></li>
-        </ul>
-      </div>
-    </span>
-  </div>
-  
-  <div class="acct-header">
-    <a href="{{%s:prefix}}/@{{%s:acct}}" class="header-btn btn">
-      <span class="btn-header">{{%s:tab_statuses_text}}</span>
-      <span class="btn-content">{{%d:statuses_count}}</span>
-    </a>
+        <span class="menu-container user-options-btn">
+            Menu
+            <div class="menu menu-options">
+                <ul>
+                    <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unsubscribe}}subscribe"><input class="btn-menu" type="button" value="{{%s:subscribe_text}}"></a></li>
+                    <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unblock}}block"><input class="btn-menu" type="button" value="{{%s:block_text}}"></a></li>
+                    <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unmute}}mute"><input class="btn-menu" type="button" value="{{%s:mute_text}}"></a></li>
+                </ul>
+            </div>
+        </span>
+    </div>
     
-    <a href="{{%s:prefix}}/@{{%s:acct}}/following" class="header-btn btn">
-      <span class="btn-header">{{%s:tab_following_text}}</span>
-      <span class="btn-content">{{%d:following_count}}</span>
-    </a>
+    <div class="acct-header">
+        <a href="{{%s:prefix}}/@{{%s:acct}}" class="header-btn btn">
+            <span class="btn-header">[% lang('TAB_STATUSES') %]</span>
+            <span class="btn-content">[% acct.statuses_count %]</span>
+        </a>
+        
+        <a href="{{%s:prefix}}/@{{%s:acct}}/following" class="header-btn btn">
+            <span class="btn-header">[% lang('TAB_FOLLOWING') %]</span>
+            <span class="btn-content">[% acct.following_count %]</span>
+        </a>
 
-    <a href="{{%s:prefix}}/@{{%s:acct}}/followers" class="header-btn btn">
-      <span class="btn-header">{{%s:tab_followers_text}}</span>
-      <span class="btn-content">{{%d:followers_count}}</span>
-    </a>
-    
-    {{%s:follow_btn}}
-  </div>
-  <div class="acct-pfp-wrapper">
-    <img class="acct-pfp" src="{{%s:avatar}}">
-  </div>
+        <a href="{{%s:prefix}}/@{{%s:acct}}/followers" class="header-btn btn">
+            <span class="btn-header">[% lang('TAB_FOLLOWERS') %]</span>
+            <span class="btn-content">[% acct.followers_count %]</span>
+        </a>
+        
+        [%# {{%s:follow_btn}} %]
+    </div>
+    <div class="acct-pfp-wrapper">
+        <img class="acct-pfp" src="[% acct.avatar %]">
+    </div>
 </div>
 
-{{%s:info}}
+[% IF acct.note %]
+    <div class="account-info">
+        <div class="account-note">[% acct.note %]</div>
+    </div>
+[% END %]
 
 <table class="tabs ui-table">
-  <tr>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/statuses"><input class="tab-btn btn {{%s:tab_statuses_focused}}" type="button" value="{{%s:tab_statuses_text}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/scrobbles"><input class="tab-btn btn {{%s:tab_scrobbles_focused}}" type="button" value="{{%s:tab_scrobbles_text}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/media"><input class="tab-btn btn {{%s:tab_media_focused}}" type="button" value="{{%s:tab_media_text}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/pinned"><input class="tab-btn btn {{%s:tab_pinned_focused}}" type="button" value="{{%s:tab_pinned_text}}"></a>
-    </td>
-  </tr>
+    <tr>
+        <td>
+            <a href="{{%s:prefix}}/@{{%s:acct}}/statuses"><input class="tab-btn btn {{%s:tab_statuses_focused}}" type="button" value="{{%s:tab_statuses_text}}"></a>
+        </td>
+        <td>
+            <a href="{{%s:prefix}}/@{{%s:acct}}/scrobbles"><input class="tab-btn btn {{%s:tab_scrobbles_focused}}" type="button" value="{{%s:tab_scrobbles_text}}"></a>
+        </td>
+        <td>
+            <a href="{{%s:prefix}}/@{{%s:acct}}/media"><input class="tab-btn btn {{%s:tab_media_focused}}" type="button" value="{{%s:tab_media_text}}"></a>
+        </td>
+        <td>
+            <a href="{{%s:prefix}}/@{{%s:acct}}/pinned"><input class="tab-btn btn {{%s:tab_pinned_focused}}" type="button" value="{{%s:tab_pinned_text}}"></a>
+        </td>
+    </tr>
 </table>
 
 <div class="account-content">
-  {{%s:acct_content}}
+    [% content %]
 </div>
 

From 937301e30796ac303981d49b0b177e46688a8b2f Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 19:20:26 +0000
Subject: [PATCH 042/143] Notifications perl template

FossilOrigin-Name: 7f5ff955aa478f571019fe9d6cf992f229e421dd7bac1b8ea689594baca3621f
---
 perl/main.pl                |  2 +-
 perl/notifications.pm       | 15 ++++++-
 src/global_perl.c           |  2 +
 src/notifications.c         | 88 +++++++++++++++++--------------------
 templates/content_notifs.tt |  1 +
 5 files changed, 59 insertions(+), 49 deletions(-)
 create mode 100644 templates/content_notifs.tt

diff --git a/perl/main.pl b/perl/main.pl
index d672903..a215e98 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -3,7 +3,7 @@ use warnings;
 # Modules
 use Template;
 use l10n qw( &lang %L10N );
-use notifications qw( generate_notification_compact );
+use notifications qw( generate_notification_compact content_notifications );
 use template_helpers qw( &to_template );
 use timeline;
 use status;
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 322ced7..30c968e 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( generate_notification_compact );
+our @EXPORT = qw( generate_notification_compact content_notifications );
 
 use template_helpers 'to_template';
 
@@ -19,3 +19,16 @@ sub generate_notification_compact
 
     to_template(\%vars, \$data->{'notif_compact.tt'});
 }
+
+sub content_notifications
+{
+    my ($ssn, $data, $notifs) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn=> $ssn,
+        notif => $notif
+        );
+    
+    to_template(\%vars, \$data->{'content_notifs.tt'});
+}
diff --git a/src/global_perl.c b/src/global_perl.c
index 8233096..a2bfc3c 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -31,6 +31,7 @@
 #include "../templates/account.ctt"
 #include "../templates/account_statuses.ctt"
 #include "../templates/account_scrobbles.ctt"
+#include "../templates/content_notifs.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -51,6 +52,7 @@ void init_template_files()
     hv_stores(template_files, "account.tt", newSVpv(data_account_tt, data_account_tt_size));
     hv_stores(template_files, "account_statuses.tt", newSVpv(data_account_statuses_tt, data_account_statuses_tt_size));
     hv_stores(template_files, "account_scrobbles.tt", newSVpv(data_account_scrobbles_tt, data_account_scrobbles_tt_size));
+    hv_stores(template_files, "content_notifs.tt", newSVpv(data_content_notifs_tt, data_content_notifs_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/notifications.c b/src/notifications.c
index 8de544c..85bbd08 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -195,67 +195,61 @@ void content_notifications(PATH_ARGS)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    char* page, *notif_html = NULL;
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_notification* notifs = NULL;
     size_t notifs_len = 0;
-    char* start_id;
-    char* navigation_box = NULL;
-
-    if (keystr(ssn->cookies.logged_in))
-    {
-        struct mstdnt_get_notifications_args args = {
-            .exclude_types = 0,
-            .account_id = NULL,
-            .exclude_visibilities = 0,
-            .include_types = 0,
-            .with_muted = 1,
-            .max_id = keystr(ssn->post.max_id),
-            .min_id = keystr(ssn->post.min_id),
-            .since_id = NULL,
-            .offset = 0,
-            .limit = 20,
-        };
-
-        if (mastodont_get_notifications(api, &m_args, &args, &storage, &notifs, &notifs_len) == 0)
-        {
-            if (notifs && notifs_len)
-            {
-                notif_html = construct_notifications(ssn, api, notifs, notifs_len, NULL);
-                start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : notifs[0].id;
-                navigation_box = construct_navigation_box(start_id,
-                                                          notifs[0].id,
-                                                          notifs[notifs_len-1].id,
-                                                          NULL);
-                mstdnt_cleanup_notifications(notifs, notifs_len);
-            }
-            else
-                notif_html = construct_error("No notifications", E_NOTICE, 1, NULL);
-        }
-        else
-            notif_html = construct_error(storage.error, E_ERROR, 1, NULL);
-
-    }
-
-    struct notifications_page_template tdata = {
-        .notifications = notif_html,
-        .navigation = navigation_box
+    
+    struct mstdnt_get_notifications_args args = {
+        .exclude_types = 0,
+        .account_id = NULL,
+        .exclude_visibilities = 0,
+        .include_types = 0,
+        .with_muted = 1,
+        .max_id = keystr(ssn->post.max_id),
+        .min_id = keystr(ssn->post.min_id),
+        .since_id = NULL,
+        .offset = 0,
+        .limit = 20,
     };
 
-    page = tmpl_gen_notifications_page(&tdata, NULL);
+    if (keystr(ssn->cookies.logged_in))
+        mastodont_get_notifications(api, &m_args, &args, &storage, &notifs, &notifs_len);
+
+    // Call perl
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
+    
+    // ARGS
+    PUTBACK;
+    call_pv("notifications::content_notifications", G_SCALAR);
+    SPAGAIN;
+
+    // Duplicate so we can free the TMPs
+    char* dup = savesharedsvpv(POPs);
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
     
     struct base_page b = {
         .category = BASE_CAT_NOTIFICATIONS,
-        .content = page,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
     // Output
     render_base_page(&b, req, ssn, api);
     mastodont_storage_cleanup(&storage);
-    if (notif_html) free(notif_html);
-    if (navigation_box) free(navigation_box);
-    if (page) free(page);
+    Safefree(dup);
 }
 
 void content_notifications_compact(PATH_ARGS)
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
new file mode 100644
index 0000000..f4140c3
--- /dev/null
+++ b/templates/content_notifs.tt
@@ -0,0 +1 @@
+<h1>Notifications</h1>

From 3c4a5970e8ae687ec9df4b157103c68346719e2d Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 19:45:35 +0000
Subject: [PATCH 043/143] Lists boilerplate, Fix perl/fcgiapp header conflict
 warnings

FossilOrigin-Name: a04dd4a4b737e28845a422293b10f72335f55aea72ae5bcd20eb01f8842b0dc3
---
 perl/lists.pm              | 15 +++++++
 perl/notifications.pm      |  2 +-
 src/base_page.c            |  6 +--
 src/base_page.h            |  1 +
 src/cookie.c               |  2 +-
 src/cookie.h               |  2 +
 src/emoji.c                |  4 +-
 src/emoji.h                |  3 +-
 src/global_perl.c          |  2 +
 src/lists.c                | 81 ++++++++++++++------------------------
 src/lists.h                |  5 +--
 src/local_config_set.h     |  6 +--
 src/login.c                |  6 +--
 src/main.c                 |  6 +--
 src/page_config.c          |  4 +-
 src/page_config.h          |  4 +-
 src/path.h                 |  6 +--
 src/query.c                |  6 +--
 src/timeline.c             |  2 +-
 src/timeline.h             |  4 +-
 templates/content_lists.tt |  1 +
 21 files changed, 84 insertions(+), 84 deletions(-)
 create mode 100644 perl/lists.pm
 create mode 100644 templates/content_lists.tt

diff --git a/perl/lists.pm b/perl/lists.pm
new file mode 100644
index 0000000..f53f7ed
--- /dev/null
+++ b/perl/lists.pm
@@ -0,0 +1,15 @@
+package lists;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORTS = qw(  );
+
+use template_helpers 'to_template';
+
+sub content_lists
+{
+    my ($ssn, $data, $lists) = @_;
+
+    to_template(\%vars, $data->{'content_lists.tt'});
+}
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 30c968e..8edc869 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -27,7 +27,7 @@ sub content_notifications
     my %vars = (
         prefix => '',
         ssn=> $ssn,
-        notif => $notif
+        notifs => $notifs
         );
     
     to_template(\%vars, \$data->{'content_notifs.tt'});
diff --git a/src/base_page.c b/src/base_page.c
index 68c92db..7780d82 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <fcgi_stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include "helpers.h"
@@ -28,6 +27,7 @@
 #include "../config.h"
 #include "local_config_set.h"
 #include "account.h"
+#include <fcgi_stdio.h>
 #include "global_cache.h"
 
 // Files
@@ -80,7 +80,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     PUSHMARK(SP);
 
     if (page->session)
-        mXPUSHs(newRV_inc(page->session));
+        mXPUSHs(newRV_inc((SV*)page->session));
     else
         mXPUSHs(newRV_inc((SV*)perlify_session(ssn)));
     XPUSHs(newRV_inc((SV*)template_files));
@@ -99,7 +99,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     SPAGAIN;
 
     send_result(req, NULL, "text/html", POPp, 0);
-cleanup:
+    
     PUTBACK;
     FREETMPS;
     LEAVE;
diff --git a/src/base_page.h b/src/base_page.h
index 4538390..d2886fd 100644
--- a/src/base_page.h
+++ b/src/base_page.h
@@ -18,6 +18,7 @@
 
 #ifndef BASE_PAGE_H
 #define BASE_PAGE_H
+#include "global_perl.h"
 #include "session.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
diff --git a/src/cookie.c b/src/cookie.c
index dec504e..f746ebb 100644
--- a/src/cookie.c
+++ b/src/cookie.c
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "cookie.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
 #include <string.h>
 #include <stdlib.h>
-#include "cookie.h"
 #include "env.h"
 
 enum cookie_state
diff --git a/src/cookie.h b/src/cookie.h
index 77ace71..0381de7 100644
--- a/src/cookie.h
+++ b/src/cookie.h
@@ -21,6 +21,8 @@
 #include <stddef.h>
 #include "global_perl.h"
 #include "key.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 struct cookie_values
 {
diff --git a/src/emoji.c b/src/emoji.c
index 0f309af..5ab6d31 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "emoji.h"
 #include <stdlib.h>
 #include <string.h>
 #include "base_page.h"
 #include "string.h"
-#include "emoji.h"
 #include "easprintf.h"
 #include "string_helpers.h"
 
@@ -171,7 +171,7 @@ HV* perlify_emoji(struct mstdnt_emoji* const emoji)
     hvstores_str(emoji_hv, "shortcode", emoji->shortcode);
     hvstores_str(emoji_hv, "url", emoji->url);
     hvstores_str(emoji_hv, "static_url", emoji->static_url);
-    hvstores_str(emoji_hv, "visible_in_picker", emoji->visible_in_picker);
+    hvstores_int(emoji_hv, "visible_in_picker", emoji->visible_in_picker);
     hvstores_str(emoji_hv, "category", emoji->category);
     return emoji_hv;
 }
diff --git a/src/emoji.h b/src/emoji.h
index 67b624b..31c81fc 100644
--- a/src/emoji.h
+++ b/src/emoji.h
@@ -20,8 +20,9 @@
 #define EMOJI_H
 #include <stddef.h>
 #include <mastodont.h>
-#include "emoji_codes.h"
 #include "global_perl.h"
+#include "emoji_codes.h"
+#include "path.h"
 
 #define EMOJI_FACTOR_NUM 32
 
diff --git a/src/global_perl.c b/src/global_perl.c
index a2bfc3c..94f34cc 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -32,6 +32,7 @@
 #include "../templates/account_statuses.ctt"
 #include "../templates/account_scrobbles.ctt"
 #include "../templates/content_notifs.ctt"
+#include "../templates/content_lists.ctt"
 
 HV* template_files;
 pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -53,6 +54,7 @@ void init_template_files()
     hv_stores(template_files, "account_statuses.tt", newSVpv(data_account_statuses_tt, data_account_statuses_tt_size));
     hv_stores(template_files, "account_scrobbles.tt", newSVpv(data_account_scrobbles_tt, data_account_scrobbles_tt_size));
     hv_stores(template_files, "content_notifs.tt", newSVpv(data_content_notifs_tt, data_content_notifs_tt_size));
+    hv_stores(template_files, "content_lists.tt", newSVpv(data_content_lists_tt, data_content_lists_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/lists.c b/src/lists.c
index c12c89e..1433cb1 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdlib.h>
+#include "global_perl.h"
 #include "helpers.h"
 #include "base_page.h"
 #include "../config.h"
@@ -33,50 +34,13 @@
 #include "../static/list.ctmpl"
 #include "../static/lists.ctmpl"
 
-char* construct_list(struct mstdnt_list* list, size_t* size)
-{
-    char* result;
-    char* title = list->title;
-    char* list_name = sanitize_html(title);
-    struct list_template data = {
-        .list = list_name,
-        .prefix = config_url_prefix,
-        .list_id = list->id
-    };
-    result = tmpl_gen_list(&data, size);
-    if (list_name != title)
-        free(list_name);
-    return result;
-}
-
-static char* construct_list_voidwrap(void* passed, size_t index, size_t* res)
-{
-    return construct_list((struct mstdnt_list*)passed + index, res);
-}
-
-char* construct_lists(struct mstdnt_list* lists, size_t size, size_t* ret_size)
-{
-    return construct_func_strings(construct_list_voidwrap, lists, size, ret_size);
-}
-
-char* construct_lists_view(char* lists_string, size_t* size)
-{
-    struct lists_template data = {
-        .lists = lists_string,
-        .prefix = config_url_prefix
-    };
-    return tmpl_gen_lists(&data, size);
-}
-
 void content_lists(PATH_ARGS)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
     struct mstdnt_list* lists = NULL;
-    size_t size_list = 0;
+    size_t list_len = 0;
     struct mstdnt_storage storage = { 0 };
-    char* lists_format = NULL;
-    char* lists_page = NULL;
 
     if (ssn->post.title.is_set)
     {
@@ -89,20 +53,36 @@ void content_lists(PATH_ARGS)
         mastodont_storage_cleanup(&create_storage);
     }
 
-    if (mastodont_get_lists(api, &m_args, &storage, &lists, &size_list))
-    {
-        lists_page = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        lists_format = construct_lists(lists, size_list, NULL);
-        if (!lists_format)
-            lists_format = construct_error("No lists", E_ERROR, 1, NULL);
-        lists_page = construct_lists_view(lists_format, NULL);
-    }
+    mastodont_get_lists(api, &m_args, &storage, &lists, &list_len);
+
+    // Call perl
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    // TODO Perlify lists
+    
+    // ARGS
+    PUTBACK;
+    call_pv("lists::content_lists", G_SCALAR);
+    SPAGAIN;
+
+    // Duplicate so we can free the TMPs
+    char* dup = savesharedsvpv(POPs);
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     struct base_page b = {
         .category = BASE_CAT_LISTS,
-        .content = lists_page,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
@@ -111,9 +91,8 @@ void content_lists(PATH_ARGS)
 
     // Cleanup
     mastodont_storage_cleanup(&storage);
-    if (lists_format) free(lists_format);
-    if (lists_page) free(lists_page);
     mstdnt_cleanup_lists(lists);
+    Safefree(dup);
 }
 
 void list_edit(PATH_ARGS)
diff --git a/src/lists.h b/src/lists.h
index 289163e..5414ce7 100644
--- a/src/lists.h
+++ b/src/lists.h
@@ -22,10 +22,9 @@
 #include <mastodont.h>
 #include "session.h"
 
-char* construct_list(struct mstdnt_list* list, size_t* size);
-char* construct_lists(struct mstdnt_list* lists, size_t size, size_t* ret_size);
-char* construct_lists_view(char* lists_string, size_t* size);
+/** Creates the main lists view */
 void content_lists(PATH_ARGS);
+/** Creates a list and then redirects */
 void list_edit(PATH_ARGS);
 
 #endif // LISTS_H
diff --git a/src/local_config_set.h b/src/local_config_set.h
index 0135b5f..c3be2c7 100644
--- a/src/local_config_set.h
+++ b/src/local_config_set.h
@@ -19,12 +19,12 @@
 #ifndef LOCAL_CONFIG_SET_H
 #define LOCAL_CONFIG_SET_H
 #include <mastodont.h>
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
-#include "local_config.h"
 #include "session.h"
 #include "attachments.h"
+#include "local_config.h"
 #include "key.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 enum config_page
 {
diff --git a/src/login.c b/src/login.c
index c5e1654..0bc74d9 100644
--- a/src/login.c
+++ b/src/login.c
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <curl/curl.h>
-#include <fcgi_stdio.h>
+#include "login.h"
 #include <string.h>
 #include <stdlib.h>
 #include "helpers.h"
 #include "query.h"
 #include "base_page.h"
-#include "login.h"
 #include "error.h"
 #include "easprintf.h"
 #include "../config.h"
 #include "http.h"
+#include <curl/curl.h>
+#include <fcgi_stdio.h>
 
 // Files
 #include "../static/login.ctmpl"
diff --git a/src/main.c b/src/main.c
index 82e2101..c4ee17b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,12 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <fcgi_stdio.h>
 #include <EXTERN.h>
 #include <perl.h>
-#include <pthread.h>
 #include "global_perl.h"
-#include <fcgiapp.h>
+#include <pthread.h>
 #include <string.h>
 #include <mastodont.h>
 #include <stdlib.h>
@@ -47,6 +45,8 @@
 #include "local_config_set.h"
 #include "global_cache.h"
 #include "conversations.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 #define THREAD_COUNT 20
 
diff --git a/src/page_config.c b/src/page_config.c
index 85bb147..1e3eb72 100644
--- a/src/page_config.c
+++ b/src/page_config.c
@@ -16,19 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <fcgi_stdio.h>
+#include "page_config.h"
 #include <stdlib.h>
 #include <string.h>
 #include "http.h"
 #include "base_page.h"
 #include "../config.h"
 #include "easprintf.h"
-#include "page_config.h"
 #include "query.h"
 #include "cookie.h"
 #include "local_config_set.h"
 #include "string_helpers.h"
 #include "l10n.h"
+#include <fcgi_stdio.h>
 
 // Pages
 #include "../static/config_general.ctmpl"
diff --git a/src/page_config.h b/src/page_config.h
index e30b1d9..e2baa4f 100644
--- a/src/page_config.h
+++ b/src/page_config.h
@@ -20,10 +20,10 @@
 #define PAGE_CONFIG_H
 #include <stddef.h>
 #include <mastodont.h>
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
 #include "path.h"
 #include "session.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 void content_config_appearance(PATH_ARGS);
 void content_config_general(PATH_ARGS);
diff --git a/src/path.h b/src/path.h
index 26cbffe..2814127 100644
--- a/src/path.h
+++ b/src/path.h
@@ -18,12 +18,12 @@
 
 #ifndef PATH_H
 #define PATH_H
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "session.h"
 #include <mastodont.h>
 #include <stddef.h>
 #include "env.h"
-#include "session.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 #define PATH_ARGS FCGX_Request* req, struct session* ssn, mastodont_t* api, char** data
 
diff --git a/src/query.c b/src/query.c
index 7968cce..ede43f2 100644
--- a/src/query.c
+++ b/src/query.c
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "query.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "query.h"
 #include "env.h"
 #include "mime.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 char* read_get_data(FCGX_Request* req, struct get_values* query)
 {
diff --git a/src/timeline.c b/src/timeline.c
index 575d3f9..5563012 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "global_perl.h"
 #include "timeline.h"
 #include <stdlib.h>
 #include "helpers.h"
@@ -30,7 +31,6 @@
 #include "query.h"
 #include "error.h"
 #include "string_helpers.h"
-#include "global_perl.h"
 
 #include "../static/timeline_options.ctmpl"
 #include "../static/navigation.ctmpl"
diff --git a/src/timeline.h b/src/timeline.h
index ae20632..c2fd9f4 100644
--- a/src/timeline.h
+++ b/src/timeline.h
@@ -18,13 +18,13 @@
 
 #ifndef TIMELINE_H
 #define TIMELINE_H
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
 #include <stddef.h>
 #include <mastodont.h>
 #include "path.h"
 #include "session.h"
 #include "base_page.h"
+#include <fcgi_stdio.h>
+#include <fcgiapp.h>
 
 /** Wrapper for content_tl_federated */
 void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local);
diff --git a/templates/content_lists.tt b/templates/content_lists.tt
new file mode 100644
index 0000000..d3c5931
--- /dev/null
+++ b/templates/content_lists.tt
@@ -0,0 +1 @@
+<h1>Lists</h1>

From 6c28a9cbfa2376c192352d5510167b300177e271 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 19:46:59 +0000
Subject: [PATCH 044/143] Export &lists::content_lists

FossilOrigin-Name: 4a2a1ce36f827bda26d6c5f24ed4ef64ed025ddbd8e8fe9732d0953d1892d7c2
---
 perl/lists.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl/lists.pm b/perl/lists.pm
index f53f7ed..e107948 100644
--- a/perl/lists.pm
+++ b/perl/lists.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORTS = qw(  );
+our @EXPORTS = qw( content_lists );
 
 use template_helpers 'to_template';
 

From f598254df55435f194ec773b8e14f41cb435e654 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 19:47:58 +0000
Subject: [PATCH 045/143] Fix

FossilOrigin-Name: 777207b1be91397673581322f0e29de2710da552cfc95e3ef65a97952b2062db
---
 perl/lists.pm | 4 +++-
 perl/main.pl  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl/lists.pm b/perl/lists.pm
index e107948..40cec0e 100644
--- a/perl/lists.pm
+++ b/perl/lists.pm
@@ -11,5 +11,7 @@ sub content_lists
 {
     my ($ssn, $data, $lists) = @_;
 
-    to_template(\%vars, $data->{'content_lists.tt'});
+    my %vars = ();
+
+    to_template(\%vars, \$data->{'content_lists.tt'});
 }
diff --git a/perl/main.pl b/perl/main.pl
index a215e98..6d0c636 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -8,6 +8,7 @@ use template_helpers qw( &to_template );
 use timeline;
 use status;
 use account;
+use lists;
 
 # my $template = Template->new(
 #     {

From 4697a9fce8cfd9e85a8d1e8779d23eaf9b00c43a Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 5 Aug 2022 20:38:49 +0000
Subject: [PATCH 046/143] Remove:

FossilOrigin-Name: 7e34768ce6d9c1e3bf79e6fd90b1881a7e3ffd97b6720bd0369a493334eae795
---
 src/cookie.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cookie.c b/src/cookie.c
index f746ebb..b0cf02e 100644
--- a/src/cookie.c
+++ b/src/cookie.c
@@ -17,8 +17,6 @@
  */
 
 #include "cookie.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
 #include <string.h>
 #include <stdlib.h>
 #include "env.h"

From a6d119833c9b9ce45825bf465f0b5fb1ce3f0949 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 6 Aug 2022 04:47:57 +0000
Subject: [PATCH 047/143] Search boilerplate

FossilOrigin-Name: f7c7717cc3d549d6a2126efef96e702a6027c7841531b7eb276c8ebbd4106d0d
---
 perl/search.pm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 perl/search.pm

diff --git a/perl/search.pm b/perl/search.pm
new file mode 100644
index 0000000..8da1d91
--- /dev/null
+++ b/perl/search.pm
@@ -0,0 +1,56 @@
+package search;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORTS = qw( content_search );
+
+use template_helpers 'to_template';
+
+use constant
+{
+    SEARCH_CAT_STATUSES => 0,
+    SEARCH_CAT_ACCOUNTS => 1,
+    SEARCH_CAT_TAGS     => 2
+};
+
+sub search_page
+{
+    my ($ssn, $data, $tab, $content) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        tab => $tab,
+        content => $content,
+        );
+
+    to_template(\%vars, \$data->{'search.tt'});
+}
+
+sub search_statuses
+{
+    my ($ssn, $data, $statuses) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        statuses => $statuses,
+        );
+
+    search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_statuses.tt'})); 
+}
+
+sub content_search
+{
+    my ($ssn, $data, $search) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        search => $search,
+        );
+
+    to_template(\%vars, \$data->{'content_search.tt'});
+}
+

From 19b19b900bf77380acb45c48094f2519c87023d2 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 6 Aug 2022 05:06:27 +0000
Subject: [PATCH 048/143] Chat

FossilOrigin-Name: 7129d3c344032bab229fdc356df7522608a95af3696d92d22ec8f40d557c5734
---
 perl/chat.pm   | 35 +++++++++++++++++++++++++++++++++++
 perl/search.pm | 29 ++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 perl/chat.pm

diff --git a/perl/chat.pm b/perl/chat.pm
new file mode 100644
index 0000000..533e090
--- /dev/null
+++ b/perl/chat.pm
@@ -0,0 +1,35 @@
+package chat;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORTS = qw( content_chats );
+
+use template_helpers 'to_template';
+
+sub construct_chat
+{
+    my ($ssn, $data, $chat) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        chat => $chat,
+        );
+
+    to_template(\%vars, \$data->{'chat.tt'});
+}
+
+sub content_chats
+{
+    my ($ssn, $data, $chats) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        chats => $chats,
+        );
+
+    to_template(\%vars, \$data->{'content_chats.tt'});
+}
+
diff --git a/perl/search.pm b/perl/search.pm
index 8da1d91..09039f4 100644
--- a/perl/search.pm
+++ b/perl/search.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORTS = qw( content_search );
+our @EXPORTS = qw( content_search search_tags search_accounts search_statuses );
 
 use template_helpers 'to_template';
 
@@ -28,6 +28,33 @@ sub search_page
     to_template(\%vars, \$data->{'search.tt'});
 }
 
+sub search_tags
+{
+    my ($ssn, $data, $tags) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        statuses => $statuses,
+        );
+
+    search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_tags.tt'})); 
+}
+
+sub search_accounts
+{
+    my ($ssn, $data, $statuses) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        statuses => $statuses,
+        );
+
+    search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_accounts.tt'})); 
+}
+
+
 sub search_statuses
 {
     my ($ssn, $data, $statuses) = @_;

From ae453835b4f931cc6240f8ce8e5c6b760c47b98e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 6 Aug 2022 17:41:35 +0000
Subject: [PATCH 049/143] Add content to Account page

FossilOrigin-Name: ddb93098b95a7e750d80156451580be8a59a8471985b93ad00cf43e05a6e49dd
---
 perl/account.pm      |  2 ++
 src/account.c        |  2 +-
 templates/account.tt | 30 ++++++++++++++++--------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/perl/account.pm b/perl/account.pm
index 981e016..7b7be68 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -7,6 +7,7 @@ use Exporter 'import';
 our @EXPORT = qw( account content_statuses );
 
 use template_helpers 'to_template';
+use l10n 'lang';
 
 sub generate_account
 {
@@ -15,6 +16,7 @@ sub generate_account
     my %vars = (
         prefix => '',
         ssn => $ssn,
+        lang => \&lang,
         relationship => $relationship,
         content => $content,
         acct => $acct,
diff --git a/src/account.c b/src/account.c
index 86c84ad..a14b405 100644
--- a/src/account.c
+++ b/src/account.c
@@ -935,7 +935,7 @@ HV* perlify_relationship(const struct mstdnt_relationship* rel)
     hvstores_int(rel_hv, "notifying", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_NOTIFYING));
     hvstores_int(rel_hv, "blocking", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_BLOCKING));
     hvstores_int(rel_hv, "domain_blocking", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_DOMAIN_BLOCKING));
-    hvstores_str(rel_hv, "blocked_by", rel->id);
+    hvstores_str(rel_hv, "blocked_by", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_BLOCKED_BY));
 
     return rel_hv;
 }
diff --git a/templates/account.tt b/templates/account.tt
index 78435d5..c12d05d 100644
--- a/templates/account.tt
+++ b/templates/account.tt
@@ -3,11 +3,11 @@
 [% END %]
 [% IF acct.id == ssn.account.id %]
     <div class="menubar">
-        <a href="{{%s:prefix}}/blocked">{{ %s : blocked_str }}</a>
+        <a href="$prefix/blocked">{{ %s : blocked_str }}</a>
         <span class="bullet-separate">&bull;</span>
-        <a href="{{%s:prefix}}/muted">{{ %s : muted_str }}</a>
+        <a href="$prefix/muted">{{ %s : muted_str }}</a>
         <span class="bullet-separate">&bull;</span>
-        <a href="{{%s:prefix}}/favourites">{{ %s : favourited_str }}</a>
+        <a href="$prefix/favourites">{{ %s : favourited_str }}</a>
     </div>
 [% END %]
 <div class="account">
@@ -24,26 +24,26 @@
             Menu
             <div class="menu menu-options">
                 <ul>
-                    <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unsubscribe}}subscribe"><input class="btn-menu" type="button" value="{{%s:subscribe_text}}"></a></li>
-                    <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unblock}}block"><input class="btn-menu" type="button" value="{{%s:block_text}}"></a></li>
-                    <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unmute}}mute"><input class="btn-menu" type="button" value="{{%s:mute_text}}"></a></li>
+                    <li><a class="nolink" href="$prefix/user/{{%s:userid}}/action/{{%s:unsubscribe}}subscribe"><input class="btn-menu" type="button" value="{{%s:subscribe_text}}"></a></li>
+                    <li><a class="nolink" href="$prefix/user/{{%s:userid}}/action/{{%s:unblock}}block"><input class="btn-menu" type="button" value="{{%s:block_text}}"></a></li>
+                    <li><a class="nolink" href="$prefix/user/{{%s:userid}}/action/{{%s:unmute}}mute"><input class="btn-menu" type="button" value="{{%s:mute_text}}"></a></li>
                 </ul>
             </div>
         </span>
     </div>
     
     <div class="acct-header">
-        <a href="{{%s:prefix}}/@{{%s:acct}}" class="header-btn btn">
+        <a href="$prefix/@[% acct.acct %]" class="header-btn btn">
             <span class="btn-header">[% lang('TAB_STATUSES') %]</span>
             <span class="btn-content">[% acct.statuses_count %]</span>
         </a>
         
-        <a href="{{%s:prefix}}/@{{%s:acct}}/following" class="header-btn btn">
+        <a href="$prefix/@[% acct.acct %]/following" class="header-btn btn">
             <span class="btn-header">[% lang('TAB_FOLLOWING') %]</span>
             <span class="btn-content">[% acct.following_count %]</span>
         </a>
 
-        <a href="{{%s:prefix}}/@{{%s:acct}}/followers" class="header-btn btn">
+        <a href="$prefix/@[% acct.acct %]/followers" class="header-btn btn">
             <span class="btn-header">[% lang('TAB_FOLLOWERS') %]</span>
             <span class="btn-content">[% acct.followers_count %]</span>
         </a>
@@ -64,21 +64,23 @@
 <table class="tabs ui-table">
     <tr>
         <td>
-            <a href="{{%s:prefix}}/@{{%s:acct}}/statuses"><input class="tab-btn btn {{%s:tab_statuses_focused}}" type="button" value="{{%s:tab_statuses_text}}"></a>
+            <a href="$prefix/@[% acct.acct %]/statuses"><input class="tab-btn btn {{%s:tab_statuses_focused}}" type="button" value="[% lang('TAB_STATUSES') %]"></a>
         </td>
         <td>
-            <a href="{{%s:prefix}}/@{{%s:acct}}/scrobbles"><input class="tab-btn btn {{%s:tab_scrobbles_focused}}" type="button" value="{{%s:tab_scrobbles_text}}"></a>
+            <a href="$prefix/@[% acct.acct %]/scrobbles"><input class="tab-btn btn {{%s:tab_scrobbles_focused}}" type="button" value="[% lang('TAB_SCROBBLES') %]"></a>
         </td>
         <td>
-            <a href="{{%s:prefix}}/@{{%s:acct}}/media"><input class="tab-btn btn {{%s:tab_media_focused}}" type="button" value="{{%s:tab_media_text}}"></a>
+            <a href="$prefix/@[% acct.acct %]/media"><input class="tab-btn btn {{%s:tab_media_focused}}" type="button" value="[% lang('TAB_MEDIA') %]"></a>
         </td>
         <td>
-            <a href="{{%s:prefix}}/@{{%s:acct}}/pinned"><input class="tab-btn btn {{%s:tab_pinned_focused}}" type="button" value="{{%s:tab_pinned_text}}"></a>
+            <a href="$prefix/@[% acct.acct %]/pinned"><input class="tab-btn btn {{%s:tab_pinned_focused}}" type="button" value="[% lang('TAB_PINNED') %]"></a>
         </td>
     </tr>
 </table>
 
 <div class="account-content">
-    [% content %]
+    [% FOREACH i IN statuses %]
+        [% create_status(ssn, data, i) %]
+    [% END %]
 </div>
 

From 1edf678d90f2b9e2ec517ad7ea25d02f965b8c20 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 7 Aug 2022 22:03:46 +0000
Subject: [PATCH 050/143] Create statuses

FossilOrigin-Name: 5767e0610e9a60b2c908fe7a62b2e723e761e4d372424a57d029ddb677fe3610
---
 perl/account.pm               | 3 +++
 perl/timeline.pm              | 2 +-
 templates/account.tt          | 4 +---
 templates/account_statuses.tt | 9 ++++++++-
 templates/timeline.tt         | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/perl/account.pm b/perl/account.pm
index 7b7be68..c75b41b 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -8,6 +8,7 @@ our @EXPORT = qw( account content_statuses );
 
 use template_helpers 'to_template';
 use l10n 'lang';
+use status 'generate_status';
 
 sub generate_account
 {
@@ -33,6 +34,8 @@ sub content_statuses
         prefix => '',
         ssn => $ssn,
         acct => $acct,
+        statuses => $statuses,
+        create_status => sub { generate_status($ssn, $data, shift); },
         );
 
     generate_account($ssn, $data, $acct, $relationship, to_template(\%vars, \$data->{'account_statuses.tt'}));
diff --git a/perl/timeline.pm b/perl/timeline.pm
index 45d65ab..f430188 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -22,7 +22,7 @@ sub content_timeline
         title => $title,
         show_post_box => $show_post_box,
         postbox => \&generate_postbox,
-        create_status => \&generate_status,
+        create_status => sub { generate_status($ssn, $data, shift); },
         );
 
     to_template(\%vars, \$data->{'timeline.tt'});
diff --git a/templates/account.tt b/templates/account.tt
index c12d05d..6f05d8a 100644
--- a/templates/account.tt
+++ b/templates/account.tt
@@ -79,8 +79,6 @@
 </table>
 
 <div class="account-content">
-    [% FOREACH i IN statuses %]
-        [% create_status(ssn, data, i) %]
-    [% END %]
+    [% content %]
 </div>
 
diff --git a/templates/account_statuses.tt b/templates/account_statuses.tt
index 50d925c..3e788e3 100644
--- a/templates/account_statuses.tt
+++ b/templates/account_statuses.tt
@@ -1 +1,8 @@
-Account statuses
+[% IF statuses %]
+    [% FOREACH i IN statuses %]
+        [% create_status(i) %]
+        asd
+    [% END %]
+[% ELSE %]
+    <p>No statuses...</p>
+[% END %]
diff --git a/templates/timeline.tt b/templates/timeline.tt
index 0c2c4e9..bb4158d 100644
--- a/templates/timeline.tt
+++ b/templates/timeline.tt
@@ -18,7 +18,7 @@
 </div>
 
 [% FOREACH i IN statuses %]
-    [% create_status(ssn, data, i) %]
+    [% create_status(i) %]
 [% END %]
 
 [%# TODO navigation %]

From ec3dbcb60bdb0ac584c98b98f0c1fd794a1dbb8f Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 8 Aug 2022 19:03:20 +0000
Subject: [PATCH 051/143] Fix perl context. I really have no clue how this
 works, but it works.

FossilOrigin-Name: 808322f63ddc7af32b994c9101b241ca9caabfc9c0ddef55fcb2f07d54251b8a
---
 perl/status.pm         |  3 +--
 perl/string_helpers.pm |  5 +++--
 src/global_perl.c      |  5 +++--
 src/global_perl.h      | 10 +++++-----
 src/main.c             | 15 +++++++--------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/perl/status.pm b/perl/status.pm
index b4249a3..f0d8388 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,7 +1,6 @@
 package status;
 use strict;
 use warnings;
-use HTML::Escape 'escape_html';
 use string_helpers qw( reltime_to_str greentextify emojify format_username localize_mentions );
 use icons qw( get_icon visibility_to_icon );
 use attachments 'generate_attachment';
@@ -30,7 +29,7 @@ sub generate_status
         make_emoji => \&generate_emoji,
         greentextify => \&greentextify,
         emojify => \&emojify,
-        escape => \&escape_html,
+        escape => undef,
         fix_mentions => \&localize_mentions,
         format_username => \&format_username,
         make_postbox => \&generate_postbox,
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 62be6ee..bbef6e8 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -1,7 +1,6 @@
 package string_helpers;
 use strict;
 use warnings;
-use HTML::Escape 'escape_html';
 use Exporter 'import';
 
 our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions );
@@ -47,7 +46,9 @@ sub emojify
 sub format_username
 {
     my $account = shift;
-    emojify(escape_html($account->{display_name}), $account->{emojis});
+
+    #TODO   ESCAPE DISPLAY NAME
+    emojify($account->{display_name}, $account->{emojis});
 }
 
 sub localize_mentions
diff --git a/src/global_perl.c b/src/global_perl.c
index 94f34cc..6de0585 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -34,10 +34,11 @@
 #include "../templates/content_notifs.ctt"
 #include "../templates/content_lists.ctt"
 
+PerlInterpreter* my_perl;
 HV* template_files;
-pthread_mutex_t perl_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t perllock_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void init_template_files()
+void init_template_files(pTHX)
 {
     template_files = newHV();
 
diff --git a/src/global_perl.h b/src/global_perl.h
index f6cfb85..f8eafac 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -28,16 +28,16 @@
 #define hvstores_ref(hv, key, val) hv_stores((hv), key,                 \
                                              ((val) ? newRV_inc((SV* const)(val)) : &PL_sv_undef))
 
-static PerlInterpreter* perl;
+extern PerlInterpreter* my_perl;
 extern HV* template_files;
-extern pthread_mutex_t perl_mutex;
+extern pthread_mutex_t perllock_mutex;
 
-#define perl_lock() do { pthread_mutex_lock(&perl_mutex); } while (0)
-#define perl_unlock() do { pthread_mutex_unlock(&perl_mutex); } while (0)
+#define perl_lock() do { pthread_mutex_lock(&perllock_mutex); } while (0)
+#define perl_unlock() do { pthread_mutex_unlock(&perllock_mutex); } while (0)
 
 #define ARG_UNDEFINED() do { XPUSHs(&PL_sv_undef); } while (0)
 
-void init_template_files();
+void init_template_files(pTHX);
 void cleanup_template_files();
 
 #endif /* GLOBAL_PERL_H */
diff --git a/src/main.c b/src/main.c
index c4ee17b..5442d7d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -213,16 +213,16 @@ int main(int argc, char **argv, char **env)
 
     // Initialize Perl
     PERL_SYS_INIT3(&argc, &argv, &env);
-    perl = perl_alloc();
-    perl_construct(perl);
+    my_perl = perl_alloc();
+    perl_construct(my_perl);
     //char* perl_argv[] = { "", "-e", data_main_pl, NULL };
     char* perl_argv[] = { "", "-I", "perl/", "perl/main.pl", NULL };
 
-    perl_parse(perl, xs_init, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
+    perl_parse(my_perl, xs_init, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
     PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-    perl_run(perl);
+    perl_run(my_perl);
 
-    init_template_files();
+    init_template_files(aTHX);
 
     // Initiate mastodont library
     mastodont_t api;
@@ -249,10 +249,9 @@ int main(int argc, char **argv, char **env)
     mastodont_cleanup(&api);
 
     cleanup_template_files();
-    
 
-    perl_destruct(perl);
-    perl_free(perl);
+    perl_destruct(my_perl);
+    perl_free(my_perl);
     PERL_SYS_TERM();
     return 0;
 }

From 1a4175351af5d988ed0bd2fe99089985c5365d25 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 8 Aug 2022 21:27:47 +0000
Subject: [PATCH 052/143] Fix timeline race condition

FossilOrigin-Name: 737dc9ddb194890e0eebc61fb6bbd5807b8c5aaad6c097ddd887b1002214c9c3
---
 src/timeline.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/timeline.c b/src/timeline.c
index 5563012..2430224 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -45,6 +45,7 @@ void content_timeline(FCGX_Request* req,
                       char* header_text,
                       int show_post_box)
 {
+    perl_lock();
     dSP;
     ENTER;
     SAVETMPS;
@@ -73,6 +74,7 @@ void content_timeline(FCGX_Request* req,
     PUTBACK;
     FREETMPS;
     LEAVE;
+    perl_unlock();
     
     struct base_page b = {
         .category = cat,

From 03e62a5e5154024d6dd16457a3ef734b6a39fd39 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 9 Aug 2022 01:56:59 +0000
Subject: [PATCH 053/143] Add back serialization

FossilOrigin-Name: 380c160f7c82dc100c2203f03e89844a06c6bf8df07ac58413be93be3ea7465d
---
 Makefile               |  1 -
 perl/account.pm        |  3 +++
 perl/status.pm         |  4 ++--
 perl/string_helpers.pm | 14 ++++++++++++--
 templates/account.tt   |  4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index ee8dd0f..3bf0aa3 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ all:
 	$(MAKE) $(TARGET)
 
 install_deps:
-	cpan HTML::Escape
 	cpan Template::Toolkit
 
 make_ctmpls: $(TMPLS_C)
diff --git a/perl/account.pm b/perl/account.pm
index c75b41b..9919b96 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -9,6 +9,7 @@ our @EXPORT = qw( account content_statuses );
 use template_helpers 'to_template';
 use l10n 'lang';
 use status 'generate_status';
+use string_helpers qw( simple_escape emojify );
 
 sub generate_account
 {
@@ -21,6 +22,8 @@ sub generate_account
         relationship => $relationship,
         content => $content,
         acct => $acct,
+        escape => \&simple_escape,
+        emojify => \&emojify,
         );
 
     to_template(\%vars, \$data->{'account.tt'});
diff --git a/perl/status.pm b/perl/status.pm
index f0d8388..1dd9ea1 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -1,7 +1,7 @@
 package status;
 use strict;
 use warnings;
-use string_helpers qw( reltime_to_str greentextify emojify format_username localize_mentions );
+use string_helpers qw( reltime_to_str greentextify emojify format_username localize_mentions simple_escape );
 use icons qw( get_icon visibility_to_icon );
 use attachments 'generate_attachment';
 use postbox 'generate_postbox';
@@ -29,7 +29,7 @@ sub generate_status
         make_emoji => \&generate_emoji,
         greentextify => \&greentextify,
         emojify => \&emojify,
-        escape => undef,
+        escape => \&simple_escape,
         fix_mentions => \&localize_mentions,
         format_username => \&format_username,
         make_postbox => \&generate_postbox,
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index bbef6e8..5d32810 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions );
+our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions simple_escape );
 
 my $re_mentions = '(?=<a .*?mention.*?)<a .*?href="https?:\/\/(.*?)\/(?:@|users\/|\/u)?(.*?)?".*?>';
 
@@ -19,6 +19,16 @@ sub reltime_to_str
     return int($since / (60 * 60 * 24 * 365)) . 'yr';
 }
 
+sub simple_escape
+{
+    my $text = shift;
+    $text =~ s/&/&amp;/gs;
+    $text =~ s/</&lt;/gs;
+    $text =~ s/>/&gt;/gs;
+    $text =~ s/"/&quot;/gs;
+    $text;
+}
+
 sub greentextify
 {
     my $text = shift;
@@ -48,7 +58,7 @@ sub format_username
     my $account = shift;
 
     #TODO   ESCAPE DISPLAY NAME
-    emojify($account->{display_name}, $account->{emojis});
+    emojify(simple_escape($account->{display_name}), $account->{emojis});
 }
 
 sub localize_mentions
diff --git a/templates/account.tt b/templates/account.tt
index 6f05d8a..1b4503a 100644
--- a/templates/account.tt
+++ b/templates/account.tt
@@ -16,7 +16,7 @@
             
         [% END %]
         <div class="acct-info-data">
-            <span class="acct-displayname">[% acct.display_name %]</span>
+            <span class="acct-displayname">[% emojify(escape(acct.display_name), acct.emojis) %]</span>
             <span class="acct-username">@[% acct.acct %]</span>
         </div>
 
@@ -57,7 +57,7 @@
 
 [% IF acct.note %]
     <div class="account-info">
-        <div class="account-note">[% acct.note %]</div>
+        <div class="account-note">[% emojify(acct.note, acct.emojis) %]</div>
     </div>
 [% END %]
 

From 82ca6009ae43e80dfe07ac8aa1746f1a08a7d961 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 9 Aug 2022 02:29:20 +0000
Subject: [PATCH 054/143] Show boosts

FossilOrigin-Name: 449baa1ea91a5f5404f938a8e210262840fbfe7d01b4de7f38efdee0de3eba8f
---
 perl/status.pm                | 10 ++++++++++
 src/status.c                  |  2 +-
 templates/account_statuses.tt |  1 -
 templates/status.tt           | 15 +++++++++++++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/perl/status.pm b/perl/status.pm
index 1dd9ea1..177a595 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -15,11 +15,21 @@ use template_helpers 'to_template';
 sub generate_status
 {
     my ($ssn, $data, $status) = @_;
+    my $boost_acct;
+
+    # Move status reference for boosts and keep account
+    # I hate this design but blame MastoAPI, not me.
+    if ($status->{reblog})
+    {
+        $boost_acct = $status->{account};
+        $status = $status->{reblog};
+    }
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
         status => $status,
+        boost => $boost_acct,
         data => $data,
         # Functions
         icon => \&get_icon,
diff --git a/src/status.c b/src/status.c
index fc99646..bc2897f 100644
--- a/src/status.c
+++ b/src/status.c
@@ -1044,7 +1044,7 @@ HV* perlify_status(const struct mstdnt_status* status)
     hvstores_int(status_hv, "reblogs_count", status->reblogs_count);
     hvstores_int(status_hv, "favourites_count", status->favourites_count);
     hvstores_int(status_hv, "replies_count", status->replies_count);
-    hvstores_ref(status_hv, "status", perlify_status(status->reblog));
+    hvstores_ref(status_hv, "reblog", perlify_status(status->reblog));
     hvstores_ref(status_hv, "application", perlify_application(status->application));
     hvstores_ref(status_hv, "media_attachments",
                  perlify_attachments(status->media_attachments, status->media_attachments_len));
diff --git a/templates/account_statuses.tt b/templates/account_statuses.tt
index 3e788e3..bc05150 100644
--- a/templates/account_statuses.tt
+++ b/templates/account_statuses.tt
@@ -1,7 +1,6 @@
 [% IF statuses %]
     [% FOREACH i IN statuses %]
         [% create_status(i) %]
-        asd
     [% END %]
 [% ELSE %]
     <p>No statuses...</p>
diff --git a/templates/status.tt b/templates/status.tt
index b87821a..e7b46d5 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -1,6 +1,17 @@
-<input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]" {{ %s:thread_hidden }}>
+<input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]"[% IF status.muted %] checked[% END %]>
 <div class="status" id="[% status.id %]">
-    [% notif_info %]
+    [% IF boost %]
+        <div class="notification-info">
+            <img src="[% boost.avatar %]" loading="lazy" class="avatar">
+            <div class="notification-user">
+                <span class="notification-text-group-with-icon">
+                    <span class="username">[% format_username(boost) %]</span>
+                    <span class="action">repeated</span>
+                </span>
+                [%# TODO the icon... %]
+            </div>
+        </div>
+    [% END %]
     <table class="status-table ui-table">
         <tr>
             <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">

From d80f9a3c62a30b2c1ebadc29e2bb51d9aae502ee Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 9 Aug 2022 02:31:17 +0000
Subject: [PATCH 055/143] Show icon

FossilOrigin-Name: de6307adad08ce359ccadf55db72af387caf37e45025b5d414cfe737092ed008
---
 templates/status.tt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/status.tt b/templates/status.tt
index e7b46d5..d137f48 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -8,7 +8,7 @@
                     <span class="username">[% format_username(boost) %]</span>
                     <span class="action">repeated</span>
                 </span>
-                [%# TODO the icon... %]
+                [% icon('repeat') %]
             </div>
         </div>
     [% END %]

From ba24b6a9933d313b5344df627d0a9ba2b3742a41 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 9 Aug 2022 02:41:50 +0000
Subject: [PATCH 056/143] Quick fix

FossilOrigin-Name: a8703da3643f9be3a251751f358e6ac8263311cf9eda3e13bf13f84b4f704a75
---
 dist/treebird.css | 4 ++--
 templates/main.tt | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 3b6b310..18bc5d5 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -279,7 +279,6 @@ table.ui-table td
 #leftbar ul.sidebar-config
 {
     background: linear-gradient(#eef1f9, #bbc3d0);
-    color: #fff;
     border-radius: 6px;
     padding: 4px;
     margin: 8px;
@@ -295,6 +294,7 @@ table.ui-table td
 .sidebarbtn-sub:active, .sidebarbtn-sub:hover
 {
     background-color: #bbc6d5;
+    text-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2);
     border: 1px solid #a8accbcc;
     box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
 }
@@ -597,7 +597,7 @@ input[type=submit].post-btn
     display: block;
     margin: 7px 8px;
     border-radius: 4px;
-    padding: 6px 10px;
+    padding: 4px 10px;
     font-size: 14px;
     text-transform: uppercase;
     color: #505050;
diff --git a/templates/main.tt b/templates/main.tt
index 713398f..3e63520 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -65,7 +65,13 @@
                             <li><a class="sidebarbtn {{ %s : active_chats }}" href="$prefix/chats">Chats</a></li>
                             <li><a class="sidebarbtn {{ %s : active_config }}" href="$prefix/config">[% lang('CONFIG') %]</a></li>
                         </ul>
-                        {{ %s : sidebar_leftbar }}
+                        
+                        <ul class="sidebar-config">
+                            <li><a class="sidebarbtn-sub" href="{{%s:prefix}}/config/general">[% lang('GENERAL') %]</a></li>
+                            <li><a class="sidebarbtn-sub" href="{{%s:prefix}}/config/appearance">[% lang('APPEARANCE') %]</a></li>
+                        </ul>
+
+                        
                         <!-- <div class="static-html" id="instance-panel"></div> -->
                         <div class="mini-links">
                             <a href="{{%s:prefix}}/about">About</a>

From c18179b52b352f4af8f44edf87c2da3c2e412809 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 10 Aug 2022 05:06:47 +0000
Subject: [PATCH 057/143] Navigation

FossilOrigin-Name: e1f2a5e64b2f8ba9ddb5c96d4d3ad8e37195d8f40020304df7f10ffb112a3c38
---
 dist/treebird.css             |  8 +++++++-
 perl/account.pm               |  2 ++
 perl/navigation.pm            | 25 +++++++++++++++++++++++++
 perl/timeline.pm              |  2 ++
 src/global_perl.c             |  2 ++
 templates/account_statuses.tt |  1 +
 templates/navigation.tt       | 34 ++++++++++++++++++++++++++++++++++
 templates/timeline.tt         |  1 +
 8 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 perl/navigation.pm
 create mode 100644 templates/navigation.tt

diff --git a/dist/treebird.css b/dist/treebird.css
index 18bc5d5..bb80050 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -597,7 +597,7 @@ input[type=submit].post-btn
     display: block;
     margin: 7px 8px;
     border-radius: 4px;
-    padding: 4px 10px;
+    padding: 6px 10px;
     font-size: 14px;
     text-transform: uppercase;
     color: #505050;
@@ -2027,6 +2027,12 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
     padding: 6px;
 }
 
+.navigation .nav-up
+{
+    width: 50px;
+    text-align: center;
+}
+
 .nav-symbol
 {
     color: #505050;
diff --git a/perl/account.pm b/perl/account.pm
index 9919b96..b2e593a 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -10,6 +10,7 @@ use template_helpers 'to_template';
 use l10n 'lang';
 use status 'generate_status';
 use string_helpers qw( simple_escape emojify );
+use navigation 'generate_navigation';
 
 sub generate_account
 {
@@ -39,6 +40,7 @@ sub content_statuses
         acct => $acct,
         statuses => $statuses,
         create_status => sub { generate_status($ssn, $data, shift); },
+        nav => generate_navigation($ssn, $data, $statuses->[0]->{id}, $statuses->[-1]->{id}),
         );
 
     generate_account($ssn, $data, $acct, $relationship, to_template(\%vars, \$data->{'account_statuses.tt'}));
diff --git a/perl/navigation.pm b/perl/navigation.pm
new file mode 100644
index 0000000..7b27737
--- /dev/null
+++ b/perl/navigation.pm
@@ -0,0 +1,25 @@
+package navigation;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORT = qw( generate_navigation );
+
+use template_helpers 'to_template';
+use l10n 'lang';
+
+sub generate_navigation
+{
+    my ($ssn, $data, $first_id, $last_id) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        lang => \&lang,
+        start_id => $ssn->{post}->{start_id} || $first_id,
+        prev_id => $first_id,
+        next_id => $last_id,
+        );
+
+    to_template(\%vars, \$data->{'navigation.tt'});
+}
diff --git a/perl/timeline.pm b/perl/timeline.pm
index f430188..31284cc 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -9,6 +9,7 @@ use template_helpers 'to_template';
 use icons 'get_icon';
 use postbox 'generate_postbox';
 use status 'generate_status';
+use navigation 'generate_navigation';
 
 sub content_timeline
 {
@@ -23,6 +24,7 @@ sub content_timeline
         show_post_box => $show_post_box,
         postbox => \&generate_postbox,
         create_status => sub { generate_status($ssn, $data, shift); },
+        nav => generate_navigation($ssn, $data, $statuses->[0]->{id}, $statuses->[-1]->{id}),
         );
 
     to_template(\%vars, \$data->{'timeline.tt'});
diff --git a/src/global_perl.c b/src/global_perl.c
index 6de0585..688f71f 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -33,6 +33,7 @@
 #include "../templates/account_scrobbles.ctt"
 #include "../templates/content_notifs.ctt"
 #include "../templates/content_lists.ctt"
+#include "../templates/navigation.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -56,6 +57,7 @@ void init_template_files(pTHX)
     hv_stores(template_files, "account_scrobbles.tt", newSVpv(data_account_scrobbles_tt, data_account_scrobbles_tt_size));
     hv_stores(template_files, "content_notifs.tt", newSVpv(data_content_notifs_tt, data_content_notifs_tt_size));
     hv_stores(template_files, "content_lists.tt", newSVpv(data_content_lists_tt, data_content_lists_tt_size));
+    hv_stores(template_files, "navigation.tt", newSVpv(data_navigation_tt, data_navigation_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/templates/account_statuses.tt b/templates/account_statuses.tt
index bc05150..711e104 100644
--- a/templates/account_statuses.tt
+++ b/templates/account_statuses.tt
@@ -2,6 +2,7 @@
     [% FOREACH i IN statuses %]
         [% create_status(i) %]
     [% END %]
+    [% nav %]
 [% ELSE %]
     <p>No statuses...</p>
 [% END %]
diff --git a/templates/navigation.tt b/templates/navigation.tt
new file mode 100644
index 0000000..a442c32
--- /dev/null
+++ b/templates/navigation.tt
@@ -0,0 +1,34 @@
+<table class="navigation ui-table">
+    <tr>
+        <td class="nav-up btn">
+            <form action="" method="post">
+                <label class="pointer">
+                    <span class="nav-btn">Up</span>
+                    <input type="submit" class="hidden">
+                </label>
+            </form>
+        </td>
+        <td class="nav-prev btn">
+            <form action="" method="post">
+                <label class="pointer">
+                    [% UNLESS prev_id == start_id %]
+                        <input type="hidden" name="start_id" value="[% start_id %]">
+                        <input type="hidden" name="min_id" value="[% prev_id %]">
+                        <input type="submit" class="hidden">
+                    [% END %]
+                    <span class="nav-btn[% IF prev_id == start_id %] btn-disabled[% END %]">Previous</span>
+                </label>
+            </form>
+        </td>
+        <td class="nav-next btn">
+            <form action="" method="post">
+                <label class="pointer">
+                    <input type="hidden" name="start_id" value="[% start_id %]">
+                    <input type="hidden" name="max_id" value="[% next_id %]">
+                    <span class="nav-btn">Next</span>
+                    <input type="submit" class="hidden">
+                </label>
+            </form>
+        </td>
+    </tr>
+</table>
diff --git a/templates/timeline.tt b/templates/timeline.tt
index bb4158d..d12d781 100644
--- a/templates/timeline.tt
+++ b/templates/timeline.tt
@@ -22,3 +22,4 @@
 [% END %]
 
 [%# TODO navigation %]
+[% nav %]

From 997cce08f6c7c5d3a90e5904b5b83880c5592497 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 11 Aug 2022 03:25:24 +0000
Subject: [PATCH 058/143] More notifications, errors, etc

FossilOrigin-Name: 052b9f7fbf6a43076c501922cc611b89949d24d03863ccb88dd0f910467eb1e2
---
 dist/treebird.css           | 81 +++++++++++++++++++++++++++++++++++--
 perl/l10n.pm                |  2 +-
 perl/notifications.pm       |  8 +++-
 perl/status.pm              |  7 +++-
 perl/string_helpers.pm      | 14 ++++++-
 src/main.c                  |  1 +
 src/notifications.c         | 20 ++++++++-
 src/notifications.h         |  1 +
 templates/content_notifs.tt | 30 +++++++++++++-
 templates/status.tt         | 33 +++++++++++----
 templates/timeline.tt       |  2 +-
 11 files changed, 179 insertions(+), 20 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index bb80050..e4d0920 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -397,6 +397,28 @@ table.present th, table.present td
     font-weight: bold;
 }
 
+.fancy-error
+{
+    margin: 36px 0;
+    text-align: center;
+}
+
+.fancy-error-text
+{
+    display: block;
+    margin-top: 30px;
+    font-size: 1.2rem;
+    color: #666;
+}
+
+.fancy-error-kaomoji
+{
+    display: block;
+    font-size: 2.4rem;
+    color: #aaa;
+    user-select: none;
+}
+
 .search-highlight
 {
     background-color: yellow;
@@ -588,10 +610,21 @@ input[type=submit].post-btn
 
 .btn-single
 {
+    display: inline-block;
     border-radius: 4px;
     border: 1px solid #cacaca;
 }
 
+.btn-small
+{
+    font-size: 12px;
+}
+
+.btn-single.btn-small
+{
+    padding: 4px 8px;
+}
+
 .sidebarbtn, .sidebarbtn:visited
 {
     display: block;
@@ -683,6 +716,12 @@ input[type=submit].post-btn
     vertical-align: middle;
 }
 
+/* CSS issue, hope for the proposed $ selected :^) */
+.status.notification-info-lookahead
+{
+    padding-top: 7px;
+}
+
 .notification-info svg.like,
 .notification-info-format svg.like
 {
@@ -784,10 +823,20 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     display: inline;
 }
 
-.notification-text-group-with-icon,
-.notification-text-group
+/* .notification-text-group-with-icon, */
+/* .notification-text-group */
+/* { */
+/*     vertical-align: middle; */
+/* } */
+
+.status.status-notification .status-content
 {
-    vertical-align: middle;
+    color: #808080;
+}
+
+.status.status-notification .status-interact
+{
+    float: right;
 }
 
 /***************************
@@ -1033,6 +1082,12 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     min-width: 0;
 }
 
+.status .notification-text-group-with-icon .username
+{
+    /* UNDO */
+    vertical-align: unset;
+}
+
 .status .status-content
 {
     margin: 4px 0 0 0;
@@ -1782,13 +1837,31 @@ input[type=radio].hidden:not(:checked) + .emoji-picker-emojos
     padding: 0 12px;
 }
 
-.simple-page h1
+.simple-page h1,
+.text-header
 {
+    font-size: 1.5rem;
     padding-left: 12px;
     padding-bottom: 7px;
     border-bottom: 1px solid #cacaca;
 }
 
+.text-header
+{
+    padding-top: 10px;
+    margin: 0;
+    background-color: #f3f3f3;
+    background: repeating-linear-gradient(
+        -45deg,
+        #efefef,
+        #efefef 10px,
+        #f6f6f6 10px,
+        #f6f6f6 20px
+    );
+    box-shadow: inset 0px -2px 2px rgba(60, 60, 60, 0.2);
+    text-shadow: 0px 2px 6px rgba(0, 0, 0, 0.2);
+}
+
 .simple-page h3
 {
     margin-left: 15px;
diff --git a/perl/l10n.pm b/perl/l10n.pm
index b546acc..3efd22d 100644
--- a/perl/l10n.pm
+++ b/perl/l10n.pm
@@ -73,7 +73,7 @@ our %L10N = (
         LOGIN_HEADER => 'Login / Register',
         LOGIN_FAIL => 'Couldn\'t login',
         NOTIF_LIKED => 'liked your status',
-        NOTIF_REACTED_WITH => 'reacted with %s',
+        NOTIF_REACTED_WITH => 'reacted with',
         NOTIF_REPEATED => 'repeated your status',
         NOTIF_FOLLOW => 'followed you',
         NOTIF_FOLLOW_REQUEST => 'wants to follow you',
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 8edc869..e071a6b 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -6,6 +6,8 @@ use Exporter 'import';
 our @EXPORT = qw( generate_notification_compact content_notifications );
 
 use template_helpers 'to_template';
+use status 'generate_status';
+use string_helpers qw( random_error_kaomoji );
 
 sub generate_notification_compact
 {
@@ -26,8 +28,10 @@ sub content_notifications
 
     my %vars = (
         prefix => '',
-        ssn=> $ssn,
-        notifs => $notifs
+        ssn => $ssn,
+        notifs => $notifs,
+        create_status => sub { generate_status($ssn, $data, shift, shift); },
+        random_error_kaomoji => \&random_error_kaomoji,
         );
     
     to_template(\%vars, \$data->{'content_notifs.tt'});
diff --git a/perl/status.pm b/perl/status.pm
index 177a595..ae2f41e 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -7,6 +7,7 @@ use attachments 'generate_attachment';
 use postbox 'generate_postbox';
 use emojis 'generate_emoji';
 use Exporter 'import';
+use l10n 'lang';
 
 our @EXPORT = qw( content_status generate_status );
 
@@ -14,7 +15,7 @@ use template_helpers 'to_template';
 
 sub generate_status
 {
-    my ($ssn, $data, $status) = @_;
+    my ($ssn, $data, $status, $notif) = @_;
     my $boost_acct;
 
     # Move status reference for boosts and keep account
@@ -29,10 +30,12 @@ sub generate_status
         prefix => '',
         ssn => $ssn,
         status => $status,
-        boost => $boost_acct,
+        boost => $boost_acct, # May be undef
         data => $data,
+        notif => $notif, # May be undef
         # Functions
         icon => \&get_icon,
+        lang => \&lang,
         rel_to_str => \&reltime_to_str,
         vis_to_icon => \&visibility_to_icon,
         make_att => \&generate_attachment,
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 5d32810..a3a60bf 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions simple_escape );
+our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions simple_escape random_error_kaomoji );
 
 my $re_mentions = '(?=<a .*?mention.*?)<a .*?href="https?:\/\/(.*?)\/(?:@|users\/|\/u)?(.*?)?".*?>';
 
@@ -86,3 +86,15 @@ sub get_mentions_from_content
     ($status->{account}->{acct} eq $ssn->{account}->{acct})
         ? $result : '@' . $status->{account}->{acct} . ' ' . $result;
 }
+
+sub random_error_kaomoji
+{
+    my @messages = (
+        "(；￣Д￣）",
+        "（｀Δ´）！",
+        "¯\\_(ツ)_/¯",
+        "(ﾉ´･ω･)ﾉ ﾐ ┸━┸",
+        "(╯°□°）╯︵ ┻━┻",
+        );
+    @messages[rand(scalar @messages)];
+}
diff --git a/src/main.c b/src/main.c
index 5442d7d..7c0c757 100644
--- a/src/main.c
+++ b/src/main.c
@@ -103,6 +103,7 @@ static struct path_info paths[] = {
     { "/blocked", content_account_blocked },
     { "/muted", content_account_muted },
     { "/notifications_compact", content_notifications_compact },
+    { "/notifications/clear", content_notifications_clear },
     { "/notifications", content_notifications },
     { "/tag/:", content_tl_tag },
     { "/chats/:", content_chat_view },
diff --git a/src/notifications.c b/src/notifications.c
index 85bbd08..0c3bf07 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -26,6 +26,7 @@
 #include "string_helpers.h"
 #include "easprintf.h"
 #include "navigation.h"
+#include "http.h"
 #include "status.h"
 #include "error.h"
 #include "emoji.h"
@@ -225,7 +226,8 @@ void content_notifications(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
+    if (notifs)
+        XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     
     // ARGS
     PUTBACK;
@@ -331,6 +333,19 @@ void content_notifications_compact(PATH_ARGS)
     free(theme_str);
 }
 
+void content_notifications_clear(PATH_ARGS)
+{
+    char* referer = GET_ENV("HTTP_REFERER", req);
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    struct mstdnt_storage storage = { 0 };
+
+    mastodont_notifications_clear(api, &m_args, &storage);
+
+    mastodont_storage_cleanup(&storage);
+    redirect(req, REDIRECT_303, referer);
+}
+
 // Converts it into a perl struct
 HV* perlify_notification(struct mstdnt_notification* notif)
 {
@@ -339,6 +354,8 @@ HV* perlify_notification(struct mstdnt_notification* notif)
 
     hvstores_str(notif_hv, "id", notif->id);
     hvstores_str(notif_hv, "created_at", notif->created_at);
+    hvstores_str(notif_hv, "emoji", notif->emoji);
+    hvstores_str(notif_hv, "type", mstdnt_notification_t_to_str(notif->type));
     hvstores_ref(notif_hv, "account", perlify_account(notif->account));
     hvstores_ref(notif_hv, "status", perlify_status(notif->status));
     
@@ -363,4 +380,5 @@ AV* perlify_notifications(struct mstdnt_notification* notifs, size_t len)
 void api_notifications(PATH_ARGS)
 {
     send_result(req, NULL, "application/json", "{\"status\":0}", 0);
+
 }
diff --git a/src/notifications.h b/src/notifications.h
index aa04a64..8a51b3b 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -49,6 +49,7 @@ char* construct_notifications_compact(struct session* ssn,
 // Page contents
 void content_notifications(PATH_ARGS);
 void content_notifications_compact(PATH_ARGS);
+void content_notifications_clear(PATH_ARGS);
 
 void api_notifications(PATH_ARGS);
 
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index f4140c3..50d327e 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -1 +1,29 @@
-<h1>Notifications</h1>
+<h1 class="text-header">Notifications</h1>
+<div class="menubar">
+    <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
+</div>
+[% IF notifs %]
+    [% FOREACH notif IN notifs %]
+        [%# There are 3 types of "different" notifications to render
+           - Mention, statuses (just regular statuses)
+           - Favorites, moves, reblogs, polls (no interaction buttons)
+           - Follows, follow requests
+           %]
+        [% IF notif.type == 'mention' ||
+           notif.type == 'status' %]
+            [% create_status(notif.status) %]
+        [% ELSIF notif.type == 'favourite' ||
+           notif.type == 'reblog' ||
+           notif.type == 'emoji reaction' ||
+           notif.type == 'poll' %]
+            [% create_status(notif.status, notif) %]
+        [% ELSIF notif.type == 'follow' || notif.type == 'follow request' %]
+            Someone attempted to follow you
+        [% END %]
+    [% END %]
+[% ELSE %]
+    <div class="fancy-error">
+        <span class="fancy-error-kaomoji">[% random_error_kaomoji() %]</span>
+        <span class="fancy-error-text">No notifications.</span>
+    </div>
+[% END %]
diff --git a/templates/status.tt b/templates/status.tt
index d137f48..49ae1ac 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -1,14 +1,31 @@
 <input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]"[% IF status.muted %] checked[% END %]>
-<div class="status" id="[% status.id %]">
-    [% IF boost %]
+<div class="status
+            [%- IF notif %] status-notification[% END %]
+            [%# Blame CSS for this class %]
+            [%- IF boost || (notif && notif.account) %] notification-info-lookahead[% END -%]
+            " id="[% status.id %]">
+    [% IF boost || (notif && notif.account) %]
         <div class="notification-info">
-            <img src="[% boost.avatar %]" loading="lazy" class="avatar">
+            <img src="[% boost.avatar || notif.account.avatar %]" loading="lazy" class="avatar">
             <div class="notification-user">
                 <span class="notification-text-group-with-icon">
-                    <span class="username">[% format_username(boost) %]</span>
-                    <span class="action">repeated</span>
+                    <span class="username">[% format_username(boost || notif.account) %]</span>
+                    <span class="action">
+                        [% IF notif && notif.type == 'favourite' %]
+                            [% lang('NOTIF_LIKED') %]
+                        [% ELSIF boost || (notif && notif.type == 'reblog') %]
+                            [% lang('NOTIF_REPEATED') %]
+                        [% ELSIF boost || (notif && notif.type == 'emoji reaction') %]
+                            [%# Yes, it can be a custom emoji too %]
+                            [% lang('NOTIF_REACTED_WITH') %] [% notif.emoji %]
+                        [% END %]
+                    </span>
                 </span>
-                [% icon('repeat') %]
+                [% IF notif && notif.type == 'favourite' %]
+                    [% icon('favourite') %]
+                [% ELSIF boost || (notif && notif.type == 'boost') %] [%# It's a repeat %]
+                    [% icon('repeat') %]
+                [% END %]
             </div>
         </div>
     [% END %]
@@ -88,6 +105,7 @@
                         </div>
                     [% END %]
                     <div class="status-interact">
+                        [% UNLESS notif %]
                         <div class="status-buttons">
                             <label for="status-quickreply-[% status.id %]" class="pointer statbtn reply-btn">
                                 [% icon('reply') %]
@@ -132,13 +150,14 @@
                                 [% emoji_picker %]
                             [%- END %]
                         </div>
+                        [% END %]
                         [%# Put these at the end, incase someone wants to move status icons to the beginning (this makes it easier %]
                         <a target="_parent" href="$prefix/status/[% status.id %]#[% status.id %]" class="pointer statbtn view-btn">
                             [% icon('expand') %]
                         </a> 
                         <span class="status-meta">
                             <a href="#[% status.id %]" title="[% time_to_str(status.created_at) %]" class="time">[%- rel_to_str(status.created_at) -%]</a>
-                            [% IF status.application && status.application.name %]
+                            [% IF status.application && status.application.name && !notif %]
                                 [% IF status.application.url %]
                                     <a class="application-name" href="[% status.application.url %]">[% status.application.name %]</a>
                                 [% ELSE %]
diff --git a/templates/timeline.tt b/templates/timeline.tt
index d12d781..c21162c 100644
--- a/templates/timeline.tt
+++ b/templates/timeline.tt
@@ -13,7 +13,7 @@
       <option value="1">Self</option>
       <option value="2">Following</option>
     </select>
-    <input type="submit" value="Filter">
+    <input type="submit" class="btn btn-single" value="Filter">
   </form>
 </div>
 

From d789caec0a837d25c9189cee0abec5a2acd7723c Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 11 Aug 2022 03:28:12 +0000
Subject: [PATCH 059/143] Disable button if no notifications

FossilOrigin-Name: 1456b994bb3d1bd152059f874616b941c42f304c291d7de14929c43b80d00d83
---
 templates/content_notifs.tt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index 50d327e..5760b0c 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -1,6 +1,10 @@
 <h1 class="text-header">Notifications</h1>
 <div class="menubar">
-    <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
+    [% IF notifs %]
+        <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
+    [% ELSE %]
+        <span class="btn btn-single btn-small btn-disabled">Clear notifications</span>
+    [% END %]
 </div>
 [% IF notifs %]
     [% FOREACH notif IN notifs %]

From b3c3fe360abdc6aca09e1ff09a60c00f4cda39ad Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 11 Aug 2022 04:56:32 +0000
Subject: [PATCH 060/143] Errors and fix autovivification with statuses in
 account

FossilOrigin-Name: f1e729fac2faaf4aa483d98f29712f752de726f9c2063cfa6fa35551cc5d92e9
---
 dist/treebird.css             | 34 +++++++++++++++++++++++++++-------
 perl/account.pm               |  7 +++++--
 perl/icons.pm                 |  2 ++
 perl/notifications.pm         |  2 ++
 perl/string_helpers.pm        |  1 +
 src/account.c                 |  2 +-
 templates/account_statuses.tt |  8 ++++++--
 templates/content_notifs.tt   | 20 +++++++++++++++++++-
 templates/status.tt           |  4 ++--
 9 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index e4d0920..ff3d8bb 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -411,6 +411,14 @@ table.present th, table.present td
     color: #666;
 }
 
+.fancy-error-subtext
+{
+    display: block;
+    margin: 12px 24px 0 24px;
+    font-size: 1rem;
+    color: #222;
+}
+
 .fancy-error-kaomoji
 {
     display: block;
@@ -842,7 +850,8 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 /***************************
  *      Statuses           *
  **************************/
-.status
+.status,
+.notification-regular
 {
     padding: 11px;
     padding-bottom: 6px;
@@ -1021,6 +1030,12 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     padding: 0 0 0 10px;
 }
 
+.notification-regular .notification-content
+{
+    margin-top: 4px;
+    font-size: 14px;
+}
+
 .status .status-info > table.ui-table
 {
     width: 100%;
@@ -1082,11 +1097,11 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     min-width: 0;
 }
 
-.status .notification-text-group-with-icon .username
-{
-    /* UNDO */
-    vertical-align: unset;
-}
+/* .status .notification-text-group-with-icon .username */
+/* { */
+/*     /\* UNDO *\/ */
+/*     vertical-align: unset; */
+/* } */
 
 .status .status-content
 {
@@ -1519,6 +1534,11 @@ p}
     background: linear-gradient(#aa0000, #600000);
 }
 
+.action
+{
+    vertical-align: middle;
+}
+
 /****************
  *   Statusbox  *
  ****************/
@@ -2248,7 +2268,7 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
 {
     color: #ccc;
     font-size: 8px;
-    margin: unset;e
+    margin: unset;
 }
 
 #instance-panel + .mini-links
diff --git a/perl/account.pm b/perl/account.pm
index b2e593a..51ac417 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -1,6 +1,7 @@
 package account;
 use strict;
 use warnings;
+use Data::Dumper;
 
 use Exporter 'import';
 
@@ -9,7 +10,7 @@ our @EXPORT = qw( account content_statuses );
 use template_helpers 'to_template';
 use l10n 'lang';
 use status 'generate_status';
-use string_helpers qw( simple_escape emojify );
+use string_helpers qw( simple_escape emojify random_error_kaomoji );
 use navigation 'generate_navigation';
 
 sub generate_account
@@ -40,7 +41,9 @@ sub content_statuses
         acct => $acct,
         statuses => $statuses,
         create_status => sub { generate_status($ssn, $data, shift); },
-        nav => generate_navigation($ssn, $data, $statuses->[0]->{id}, $statuses->[-1]->{id}),
+        # Make subroutine so Perl doesn't autovivify
+        nav => sub { generate_navigation($ssn, $data, $statuses->[0]->{id}, $statuses->[-1]->{id}) },
+        random_error_kaomoji => \&random_error_kaomoji,
         );
 
     generate_account($ssn, $data, $acct, $relationship, to_template(\%vars, \$data->{'account_statuses.tt'}));
diff --git a/perl/icons.pm b/perl/icons.pm
index 93e095e..aab079f 100644
--- a/perl/icons.pm
+++ b/perl/icons.pm
@@ -42,6 +42,8 @@ sub get_icon_svg
         unlisted => '<svg class="visibility vis-unlisted" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 9.9-1"></path></svg>',
 
         public => '<svg class="visibility vis-public" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>',
+
+        follow => '<svg class="follow" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="20" y1="8" x2="20" y2="14"></line><line x1="23" y1="11" x2="17" y2="11"></line></svg>',
         );
 
     $res{$_[0]};
diff --git a/perl/notifications.pm b/perl/notifications.pm
index e071a6b..869caa9 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -8,6 +8,7 @@ our @EXPORT = qw( generate_notification_compact content_notifications );
 use template_helpers 'to_template';
 use status 'generate_status';
 use string_helpers qw( random_error_kaomoji );
+use icons 'get_icon';
 
 sub generate_notification_compact
 {
@@ -31,6 +32,7 @@ sub content_notifications
         ssn => $ssn,
         notifs => $notifs,
         create_status => sub { generate_status($ssn, $data, shift, shift); },
+        icon => \&get_icon,
         random_error_kaomoji => \&random_error_kaomoji,
         );
     
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index a3a60bf..09fdf4b 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -56,6 +56,7 @@ sub emojify
 sub format_username
 {
     my $account = shift;
+    return unless $account;
 
     #TODO   ESCAPE DISPLAY NAME
     emojify(simple_escape($account->{display_name}), $account->{emojis});
diff --git a/src/account.c b/src/account.c
index a14b405..fcaa75c 100644
--- a/src/account.c
+++ b/src/account.c
@@ -246,7 +246,7 @@ static char* account_statuses_cb(HV* session_hv,
         XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
     else ARG_UNDEFINED();
     
-    if (statuses)
+    if (statuses && statuses_len)
         XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
     else ARG_UNDEFINED();
 
diff --git a/templates/account_statuses.tt b/templates/account_statuses.tt
index 711e104..e025b2b 100644
--- a/templates/account_statuses.tt
+++ b/templates/account_statuses.tt
@@ -2,7 +2,11 @@
     [% FOREACH i IN statuses %]
         [% create_status(i) %]
     [% END %]
-    [% nav %]
+    [% nav() %]
 [% ELSE %]
-    <p>No statuses...</p>
+    <div class="fancy-error">
+        <span class="fancy-error-kaomoji">[% random_error_kaomoji() %]</span>
+        <span class="fancy-error-text">No statuses.</span>
+        <span class="fancy-error-subtext">Either this user just lurks, or their posts have not yet federated. Usually the latter occurs on new instances.</span>
+    </div>
 [% END %]
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index 5760b0c..f120c27 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -22,7 +22,25 @@
            notif.type == 'poll' %]
             [% create_status(notif.status, notif) %]
         [% ELSIF notif.type == 'follow' || notif.type == 'follow request' %]
-            Someone attempted to follow you
+            <table class="notification notification-regular ui-table">
+                <tr>
+                    <td class="pfp-td">
+                        <img src="[% notif.account.avatar %]" loading="lazy">
+                    </td>
+                    <td class="notification-info">
+                        <div class="notification-info-format">
+                            <span class="notification-text-group-with-icon">
+                                <span title="[% notif.account.acct %]" class="username">[% notif.account.display_name %]</span>
+                                <span class="action">followed</span>
+                            </span>
+                            [% icon('follow') %]
+                        </div>
+                        <div class="notification-content">
+                            <a href="/@[% notif.account.acct %]">@[% notif.account.acct %]</a>
+                        </div>
+                    </td>
+                </tr>
+            </table>
         [% END %]
     [% END %]
 [% ELSE %]
diff --git a/templates/status.tt b/templates/status.tt
index 49ae1ac..8fc314f 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -22,8 +22,8 @@
                     </span>
                 </span>
                 [% IF notif && notif.type == 'favourite' %]
-                    [% icon('favourite') %]
-                [% ELSIF boost || (notif && notif.type == 'boost') %] [%# It's a repeat %]
+                    [% icon('like') %]
+                [% ELSIF boost || (notif && notif.type == 'reblog') %] [%# It's a repeat %]
                     [% icon('repeat') %]
                 [% END %]
             </div>

From 33dbabd49b0fec94adaed5357cb0a4c7842794d1 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 12 Aug 2022 04:50:04 +0000
Subject: [PATCH 061/143] Mastodont: rename to mstdnt_notifications_args

FossilOrigin-Name: 5998ae4318e218c7175f57bb6416ed4be9e68432ab4d47575ae97f6c723dd01f
---
 dist/treebird.css           | 20 ++++----
 perl/status.pm              |  1 +
 src/base_page.c             |  2 +-
 src/notifications.c         |  4 +-
 templates/content_notifs.tt | 95 +++++++++++++++++++------------------
 templates/status.tt         | 24 +++++++---
 6 files changed, 80 insertions(+), 66 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index ff3d8bb..ea7b454 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -471,6 +471,7 @@ table.present th, table.present td
     padding: 3px 12px;
     width: 100%;
     border: 0;
+    font-size: 14px;
     cursor: pointer;
     text-align: left;
     box-sizing: border-box;
@@ -1025,8 +1026,7 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 .notification-content
 {
     position: relative;
-    min-width: 0;
-    width: auto;
+    width: 100%;
     padding: 0 0 0 10px;
 }
 
@@ -1061,15 +1061,12 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 
 .status .poster-stats
 {
-    position: relative;
     display: block;
-    max-width: 490px;
 }
 
-.status-hide:checked + .status .poster-stats
-{
-    max-width: 550px;
-}
+/* .status-hide:checked + .status .poster-stats */
+/* { */
+/* } */
 
 .poster-stats .alignend
 {
@@ -1107,7 +1104,6 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 {
     margin: 4px 0 0 0;
     overflow-wrap: anywhere;
-    width: 490px;
     line-height: 1.2;
     display: block;
 }
@@ -2211,6 +2207,12 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
     padding: 4px 0 4px 0;
 }
 
+.menu ul + ul
+{
+    border-top: 2px solid #cacaca;
+}
+
+
 .menu ul li
 {
     list-style-type: none;
diff --git a/perl/status.pm b/perl/status.pm
index ae2f41e..b1c8178 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -33,6 +33,7 @@ sub generate_status
         boost => $boost_acct, # May be undef
         data => $data,
         notif => $notif, # May be undef
+        is_statusey_notif => ($notif && ($notif->{type} eq 'mention' || $notif->{type} eq 'status')),
         # Functions
         icon => \&get_icon,
         lang => \&lang,
diff --git a/src/base_page.c b/src/base_page.c
index 7780d82..5ff8d29 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -49,7 +49,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     if (keystr(ssn->cookies.logged_in) && keystr(ssn->cookies.access_token) &&
         !ssn->config.notif_embed)
     {
-        struct mstdnt_get_notifications_args args = {
+        struct mstdnt_notifications_args args = {
             .exclude_types = 0,
             .account_id = NULL,
             .exclude_visibilities = 0,
diff --git a/src/notifications.c b/src/notifications.c
index 0c3bf07..3fe93a5 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -200,7 +200,7 @@ void content_notifications(PATH_ARGS)
     struct mstdnt_notification* notifs = NULL;
     size_t notifs_len = 0;
     
-    struct mstdnt_get_notifications_args args = {
+    struct mstdnt_notifications_args args = {
         .exclude_types = 0,
         .account_id = NULL,
         .exclude_visibilities = 0,
@@ -268,7 +268,7 @@ void content_notifications_compact(PATH_ARGS)
 
     if (keystr(ssn->cookies.logged_in))
     {
-        struct mstdnt_get_notifications_args args = {
+        struct mstdnt_notifications_args args = {
             .exclude_types = 0,
             .account_id = NULL,
             .exclude_visibilities = 0,
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index f120c27..cf710c1 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -1,51 +1,52 @@
-<h1 class="text-header">Notifications</h1>
-<div class="menubar">
+<div class="notification-container">
+    <h1 class="text-header">Notifications</h1>
+    <div class="menubar">
+        [% IF notifs %]
+            <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
+        [% ELSE %]
+            <span class="btn btn-single btn-small btn-disabled">Clear notifications</span>
+        [% END %]
+    </div>
     [% IF notifs %]
-        <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
+        [% FOREACH notif IN notifs %]
+            [%# There are 3 types of "different" notifications to render
+               - Mention, statuses (just regular statuses)
+               - Favorites, moves, reblogs, polls (no interaction buttons)
+               - Follows, follow requests
+               %]
+            [% IF notif.type == 'mention' ||
+               notif.type == 'status' ||
+               notif.type == 'favourite' ||
+               notif.type == 'reblog' ||
+               notif.type == 'emoji reaction' ||
+               notif.type == 'poll' %]
+                [% create_status(notif.status, notif) %]
+            [% ELSIF notif.type == 'follow' || notif.type == 'follow request' %]
+                <table class="notification notification-regular ui-table">
+                    <tr>
+                        <td class="pfp-td">
+                            <img src="[% notif.account.avatar %]" loading="lazy">
+                        </td>
+                        <td class="notification-info">
+                            <div class="notification-info-format">
+                                <span class="notification-text-group-with-icon">
+                                    <span title="[% notif.account.acct %]" class="username">[% notif.account.display_name %]</span>
+                                    <span class="action">followed</span>
+                                </span>
+                                [% icon('follow') %]
+                            </div>
+                            <div class="notification-content">
+                                <a href="/@[% notif.account.acct %]">@[% notif.account.acct %]</a>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            [% END %]
+        [% END %]
     [% ELSE %]
-        <span class="btn btn-single btn-small btn-disabled">Clear notifications</span>
+        <div class="fancy-error">
+            <span class="fancy-error-kaomoji">[% random_error_kaomoji() %]</span>
+            <span class="fancy-error-text">No notifications.</span>
+        </div>
     [% END %]
 </div>
-[% IF notifs %]
-    [% FOREACH notif IN notifs %]
-        [%# There are 3 types of "different" notifications to render
-           - Mention, statuses (just regular statuses)
-           - Favorites, moves, reblogs, polls (no interaction buttons)
-           - Follows, follow requests
-           %]
-        [% IF notif.type == 'mention' ||
-           notif.type == 'status' %]
-            [% create_status(notif.status) %]
-        [% ELSIF notif.type == 'favourite' ||
-           notif.type == 'reblog' ||
-           notif.type == 'emoji reaction' ||
-           notif.type == 'poll' %]
-            [% create_status(notif.status, notif) %]
-        [% ELSIF notif.type == 'follow' || notif.type == 'follow request' %]
-            <table class="notification notification-regular ui-table">
-                <tr>
-                    <td class="pfp-td">
-                        <img src="[% notif.account.avatar %]" loading="lazy">
-                    </td>
-                    <td class="notification-info">
-                        <div class="notification-info-format">
-                            <span class="notification-text-group-with-icon">
-                                <span title="[% notif.account.acct %]" class="username">[% notif.account.display_name %]</span>
-                                <span class="action">followed</span>
-                            </span>
-                            [% icon('follow') %]
-                        </div>
-                        <div class="notification-content">
-                            <a href="/@[% notif.account.acct %]">@[% notif.account.acct %]</a>
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        [% END %]
-    [% END %]
-[% ELSE %]
-    <div class="fancy-error">
-        <span class="fancy-error-kaomoji">[% random_error_kaomoji() %]</span>
-        <span class="fancy-error-text">No notifications.</span>
-    </div>
-[% END %]
diff --git a/templates/status.tt b/templates/status.tt
index 8fc314f..a73f9a5 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -2,9 +2,9 @@
 <div class="status
             [%- IF notif %] status-notification[% END %]
             [%# Blame CSS for this class %]
-            [%- IF boost || (notif && notif.account) %] notification-info-lookahead[% END -%]
+            [%- IF boost || (notif && notif.account && !is_statusey_notif) %] notification-info-lookahead[% END -%]
             " id="[% status.id %]">
-    [% IF boost || (notif && notif.account) %]
+    [% IF boost || (notif && notif.account && !is_statusey_notif) %]
         <div class="notification-info">
             <img src="[% boost.avatar || notif.account.avatar %]" loading="lazy" class="avatar">
             <div class="notification-user">
@@ -42,31 +42,41 @@
                         <div class="menu-container status-visibility">
                             [% vis_to_icon(status.visibility) %]
                             <div class="menu">
+                                [% IF notif %]
+                                    <ul>
+                                        <li>
+                                            <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
+                                        </li>
+                                        <li>
+                                            <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
+                                        </li>
+                                    </ul>
+                                [% END %]
                                 <ul>
                                     <li>
                                         <form action="$prefix/status/[% status.id %]/interact" method="post">
                                             <input type="hidden" name="itype" value="mute">
-                                            <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
+                                            <input type="submit" class="btn-menu" value="Mute">
                                         </form>
                                     </li>
                                     <li>
                                         <form action="$prefix/status/[% status.id %]/interact" method="post">
                                             <input type="hidden" name="itype" value="bookmark">
-                                            <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
+                                            <input type="submit" class="btn-menu" value="Bookmark">
                                         </form>
                                     </li>
                                     [%# pin %]
                                     <li>
                                         <form action="$prefix/status/[% status.id %]/interact" method="post">
                                             <input type="hidden" name="itype" value="pin">
-                                            <input type="submit" class="btn-menu" value="{{%s:text}}">
+                                            <input type="submit" class="btn-menu" value="Pin">
                                         </form>
                                     </li>
                                     [%# Delete %]
                                     <li>
                                         <form action="$prefix/status/[% status.id %]/interact" method="post">
                                             <input type="hidden" name="itype" value="delete">
-                                            <input type="submit" class="btn-menu" value="{{%s:text}}">
+                                            <input type="submit" class="btn-menu" value="Delete status">
                                         </form>
                                     </li>
 
@@ -105,7 +115,7 @@
                         </div>
                     [% END %]
                     <div class="status-interact">
-                        [% UNLESS notif %]
+                        [% UNLESS notif || is_statusey_notif %]
                         <div class="status-buttons">
                             <label for="status-quickreply-[% status.id %]" class="pointer statbtn reply-btn">
                                 [% icon('reply') %]

From 72ffa2abedf1e3d6d41375344a0b032539aaf1a0 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 05:01:19 +0000
Subject: [PATCH 062/143] Mark all as read, fix CSS

FossilOrigin-Name: 115f3020f24f12be0b54fcfff7088ab483fccd5029a36506e02051ec715e5b65
---
 dist/treebird.css           | 29 ++++++++++++++++++++++---
 src/main.c                  |  3 +++
 src/notifications.c         | 43 +++++++++++++++++++++++++++++++++++--
 src/notifications.h         |  1 +
 templates/content_notifs.tt |  2 ++
 templates/status.tt         |  5 +++--
 6 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index ea7b454..147b82c 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -838,14 +838,37 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 /*     vertical-align: middle; */
 /* } */
 
-.status.status-notification .status-content
+.status.status-notification:not(.status-notification-mention) .status-content
 {
     color: #808080;
 }
 
-.status.status-notification .status-interact
+.notification-unread
 {
-    float: right;
+    position: relative;
+}
+
+
+.notification-unread::before
+{
+    content:"";
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 15px;
+    height: 15px;
+    background: linear-gradient(135deg, rgba(255,0,0,1) 0%, rgba(0,0,0,0) 50%, rgba(0,0,0,0) 100%); 
+}
+
+.notification-unread::after
+{
+    content:"";
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 65px;
+    height: 65px;
+    background: linear-gradient(135deg, rgba(255,0,0,.2) 0%, rgba(0,0,0,0) 50%, rgba(0,0,0,0) 100%); 
 }
 
 /***************************
diff --git a/src/main.c b/src/main.c
index 7c0c757..cf05e20 100644
--- a/src/main.c
+++ b/src/main.c
@@ -103,6 +103,9 @@ static struct path_info paths[] = {
     { "/blocked", content_account_blocked },
     { "/muted", content_account_muted },
     { "/notifications_compact", content_notifications_compact },
+    { "/notification/:/read", content_notifications_read },
+    { "/notification/:/delete", content_notifications_clear },
+    { "/notifications/read", content_notifications_read },
     { "/notifications/clear", content_notifications_clear },
     { "/notifications", content_notifications },
     { "/tag/:", content_tl_tag },
diff --git a/src/notifications.c b/src/notifications.c
index 3fe93a5..ca5915c 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -340,12 +340,51 @@ void content_notifications_clear(PATH_ARGS)
     set_mstdnt_args(&m_args, ssn);
     struct mstdnt_storage storage = { 0 };
 
-    mastodont_notifications_clear(api, &m_args, &storage);
+    if (data)
+    {
+        mastodont_notification_dismiss(api, &m_args, &storage, data[0]);
+    }
+    else {
+        mastodont_notifications_clear(api, &m_args, &storage);
+    }
 
     mastodont_storage_cleanup(&storage);
     redirect(req, REDIRECT_303, referer);
 }
 
+void content_notifications_read(PATH_ARGS)
+{
+    char* referer = GET_ENV("HTTP_REFERER", req);
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    struct mstdnt_storage storage = { 0 };
+
+    if (data)
+    {
+        struct mstdnt_notifications_args args = { .id = data[0] };
+        mastodont_notifications_read(api, &m_args, &args, &storage, NULL);
+    }
+    else {
+        mastodont_notifications_read(api, &m_args, NULL, &storage, NULL);
+    }
+
+    mastodont_storage_cleanup(&storage);
+    redirect(req, REDIRECT_303, referer);
+}
+
+// Converts it into a perl struct
+static HV* perlify_notification_pleroma(struct mstdnt_notification_pleroma* notif)
+{
+    if (!notif) return NULL;
+    HV* notif_pl_hv = newHV();
+
+    hvstores_int(notif_pl_hv, "is_muted", notif->is_muted);
+    hvstores_int(notif_pl_hv, "is_seen", notif->is_seen);
+    
+    return notif_pl_hv;
+}
+
+
 // Converts it into a perl struct
 HV* perlify_notification(struct mstdnt_notification* notif)
 {
@@ -357,6 +396,7 @@ HV* perlify_notification(struct mstdnt_notification* notif)
     hvstores_str(notif_hv, "emoji", notif->emoji);
     hvstores_str(notif_hv, "type", mstdnt_notification_t_to_str(notif->type));
     hvstores_ref(notif_hv, "account", perlify_account(notif->account));
+    hvstores_ref(notif_hv, "pleroma", perlify_notification_pleroma(notif->pleroma));
     hvstores_ref(notif_hv, "status", perlify_status(notif->status));
     
     return notif_hv;
@@ -380,5 +420,4 @@ AV* perlify_notifications(struct mstdnt_notification* notifs, size_t len)
 void api_notifications(PATH_ARGS)
 {
     send_result(req, NULL, "application/json", "{\"status\":0}", 0);
-
 }
diff --git a/src/notifications.h b/src/notifications.h
index 8a51b3b..9ceed69 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -50,6 +50,7 @@ char* construct_notifications_compact(struct session* ssn,
 void content_notifications(PATH_ARGS);
 void content_notifications_compact(PATH_ARGS);
 void content_notifications_clear(PATH_ARGS);
+void content_notifications_read(PATH_ARGS);
 
 void api_notifications(PATH_ARGS);
 
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index cf710c1..8b9797f 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -3,8 +3,10 @@
     <div class="menubar">
         [% IF notifs %]
             <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
+            <a class="btn btn-single btn-small" href="/notifications/read">Mark as read</a>
         [% ELSE %]
             <span class="btn btn-single btn-small btn-disabled">Clear notifications</span>
+            <span class="btn btn-single btn-small btn-disabled">Mark as read</span>
         [% END %]
     </div>
     [% IF notifs %]
diff --git a/templates/status.tt b/templates/status.tt
index a73f9a5..501123e 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -1,6 +1,7 @@
 <input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]"[% IF status.muted %] checked[% END %]>
 <div class="status
-            [%- IF notif %] status-notification[% END %]
+            [%- IF notif %] status-notification[% IF notif.pleroma && !notif.pleroma.is_seen %] notification-unread[% END %][% END %]
+            [%- IF is_statusey_notif -%] status-notification-mention[% END %]
             [%# Blame CSS for this class %]
             [%- IF boost || (notif && notif.account && !is_statusey_notif) %] notification-info-lookahead[% END -%]
             " id="[% status.id %]">
@@ -115,7 +116,7 @@
                         </div>
                     [% END %]
                     <div class="status-interact">
-                        [% UNLESS notif || is_statusey_notif %]
+                        [% IF !notif || is_statusey_notif %]
                         <div class="status-buttons">
                             <label for="status-quickreply-[% status.id %]" class="pointer statbtn reply-btn">
                                 [% icon('reply') %]

From a0240a63db5f7be60ad22625afdbed230750c53a Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 05:04:15 +0000
Subject: [PATCH 063/143] Magic

FossilOrigin-Name: 59fd4c3e0ec9a394e497cb35d5e9c01e0f28a9ded3a3ca45c230f0fb8435e57b
---
 dist/treebird.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 147b82c..c94d4cb 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -203,10 +203,10 @@ table.ui-table td
 
 .sidebar
 {
-    width: 180px;
+    width: 181px;
     min-height: 600px;
-    max-width: 180px;
-    min-width: 180px;
+    max-width: 181px;
+    min-width: 181px;
     background-color: rgba(234, 236, 240, var(--sidebar-opacity));
 }
 

From ca444fde1da07c7efe7c363ca70dd03640709293 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 05:45:15 +0000
Subject: [PATCH 064/143] Bookmarks and favorites page

FossilOrigin-Name: 9af3f8d27ddd84caab9c72e74c591a1969eb3b422fcaae2f512605b836a7ff43
---
 perl/timeline.pm        |   6 ++-
 src/account.c           | 110 ++++------------------------------------
 src/timeline.c          |  14 ++---
 src/timeline.h          |   3 +-
 templates/navigation.tt |   3 ++
 templates/timeline.tt   |  36 +++++++------
 6 files changed, 48 insertions(+), 124 deletions(-)

diff --git a/perl/timeline.pm b/perl/timeline.pm
index 31284cc..981c26d 100644
--- a/perl/timeline.pm
+++ b/perl/timeline.pm
@@ -13,7 +13,7 @@ use navigation 'generate_navigation';
 
 sub content_timeline
 {
-    my ($ssn, $data, $statuses, $title, $show_post_box) = @_;
+    my ($ssn, $data, $statuses, $title, $show_post_box, $fake_timeline) = @_;
 
     my %vars = (
         prefix => '',
@@ -21,10 +21,12 @@ sub content_timeline
         data => $data,
         statuses => $statuses,
         title => $title,
+        fake_timeline => $fake_timeline,
         show_post_box => $show_post_box,
         postbox => \&generate_postbox,
         create_status => sub { generate_status($ssn, $data, shift); },
-        nav => generate_navigation($ssn, $data, $statuses->[0]->{id}, $statuses->[-1]->{id}),
+        # Don't autovivify statuses
+        nav => sub { generate_navigation($ssn, $data, $statuses->[0]->{id}, $statuses->[-1]->{id}) },
         );
 
     to_template(\%vars, \$data->{'timeline.tt'});
diff --git a/src/account.c b/src/account.c
index fcaa75c..c1fbf0a 100644
--- a/src/account.c
+++ b/src/account.c
@@ -33,6 +33,7 @@
 #include "string_helpers.h"
 #include "navigation.h"
 #include "emoji.h"
+#include "timeline.h"
 
 // Files
 #include "../static/account.ctmpl"
@@ -685,14 +686,9 @@ void content_account_action(PATH_ARGS)
 
 void content_account_bookmarks(PATH_ARGS)
 {
-    size_t status_count = 0, statuses_html_count = 0;
+    size_t statuses_len = 0;
     struct mstdnt_status* statuses = NULL;
     struct mstdnt_storage storage = { 0 };
-    char* status_format = NULL,
-        *navigation_box = NULL,
-        *output = NULL;
-    char* start_id;
-
     struct mstdnt_bookmarks_args args = {
         .max_id = keystr(ssn->post.max_id),
         .since_id = NULL,
@@ -702,49 +698,9 @@ void content_account_bookmarks(PATH_ARGS)
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
 
-    if (mastodont_get_bookmarks(api, &m_args, &args, &storage, &statuses, &status_count))
-    {
-        status_format = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        // Construct statuses into HTML
-        status_format = construct_statuses(ssn, api, statuses, status_count, NULL, &statuses_html_count);
-        if (!status_format)
-            status_format = construct_error("Couldn't load posts", E_ERROR, 1, NULL);
-    }
+    mastodont_get_bookmarks(api, &m_args, &args, &storage, &statuses, &statuses_len);
 
-    // Create post box
-    if (statuses)
-    {
-        // If not set, set it
-        start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : statuses[0].id;
-        navigation_box = construct_navigation_box(start_id,
-                                                  statuses[0].id,
-                                                  statuses[status_count-1].id,
-                                                  NULL);
-    }
-
-    struct bookmarks_page_template tdata = {
-        .statuses = status_format,
-        .navigation = navigation_box
-    };
-    output = tmpl_gen_bookmarks_page(&tdata, NULL);
-
-    struct base_page b = {
-        .category = BASE_CAT_BOOKMARKS,
-        .content = output,
-        .sidebar_left = NULL
-    };
-
-    // Output
-    render_base_page(&b, req, ssn, api);
-
-    // Cleanup
-    mastodont_storage_cleanup(&storage);
-    mstdnt_cleanup_statuses(statuses, status_count);
-    free(status_format);
-    free(navigation_box);
-    free(output);
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_BOOKMARKS, "Bookmarks", 0, 1);
 }
 
 static void accounts_page(FCGX_Request* req,
@@ -828,66 +784,20 @@ void content_account_muted(PATH_ARGS)
 
 void content_account_favourites(PATH_ARGS)
 {
-    size_t status_count = 0, statuses_html_count = 0;
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    size_t statuses_len = 0;
     struct mstdnt_status* statuses = NULL;
     struct mstdnt_storage storage = { 0 };
-    char* status_format = NULL,
-        *navigation_box = NULL,
-        *output = NULL,
-        *page = NULL;
-    char* start_id;
 
     struct mstdnt_favourites_args args = {
-
         .min_id = keystr(ssn->post.min_id),
         .limit = 20,
     };
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
 
-    if (mastodont_get_favourites(api, &m_args, &args, &storage, &statuses, &status_count))
-    {
-        status_format = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        // Construct statuses into HTML
-        status_format = construct_statuses(ssn, api, statuses, status_count, NULL, &statuses_html_count);
-        if (!status_format)
-            status_format = construct_error("Couldn't load posts", E_ERROR, 1, NULL);
-    }
-
-    // Create post box
-    if (statuses)
-    {
-        // If not set, set it
-        start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : statuses[0].id;
-        navigation_box = construct_navigation_box(start_id,
-                                                  statuses[0].id,
-                                                  statuses[status_count-1].id,
-                                                  NULL);
-    }
-
-    struct favourites_page_template tdata = {
-        .statuses = status_format,
-        .navigation = navigation_box
-    };
-    output = tmpl_gen_favourites_page(&tdata, NULL);
-
-    struct base_page b = {
-        .category = BASE_CAT_FAVOURITES,
-        .content = output,
-        .sidebar_left = NULL
-    };
-
-    // Output
-    render_base_page(&b, req, ssn, api);
-
-    // Cleanup
-    mastodont_storage_cleanup(&storage);
-    mstdnt_cleanup_statuses(statuses, status_count);
-    if (status_format) free(status_format);
-    if (navigation_box) free(navigation_box);
-    if (output) free(output);
+    mastodont_get_favourites(api, &m_args, &args, &storage, &statuses, &statuses_len);
+    
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_BOOKMARKS, "Favorites", 0, 1);
 }
 
 HV* perlify_account(const struct mstdnt_account* acct)
diff --git a/src/timeline.c b/src/timeline.c
index 2430224..d326c91 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -43,7 +43,8 @@ void content_timeline(FCGX_Request* req,
                       size_t statuses_len,
                       enum base_category cat,
                       char* header_text,
-                      int show_post_box)
+                      int show_post_box,
+                      int fake_timeline)
 {
     perl_lock();
     dSP;
@@ -63,6 +64,7 @@ void content_timeline(FCGX_Request* req,
     else ARG_UNDEFINED();
 
     mXPUSHi(show_post_box);
+    mXPUSHi(fake_timeline);
 
     PUTBACK;
     call_pv("timeline::content_timeline", G_SCALAR);
@@ -120,7 +122,7 @@ void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local
     
     mastodont_timeline_home(api, &m_args, &args, &storage, &statuses, &statuses_len);
 
-    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_HOME, NULL, 1);
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_HOME, NULL, 1, 0);
 }
 
 void tl_direct(FCGX_Request* req, struct session* ssn, mastodont_t* api)
@@ -148,7 +150,7 @@ void tl_direct(FCGX_Request* req, struct session* ssn, mastodont_t* api)
     
     mastodont_timeline_direct(api, &m_args, &args, &storage, &statuses, &statuses_len);
 
-    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_DIRECT, "Direct", 0);
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_DIRECT, "Direct", 0, 0);
 }
 
 void tl_public(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local, enum base_category cat)
@@ -178,7 +180,7 @@ void tl_public(FCGX_Request* req, struct session* ssn, mastodont_t* api, int loc
 
     mastodont_timeline_public(api, &m_args, &args, &storage, &statuses, &statuses_len);
 
-    content_timeline(req, ssn, api, &storage, statuses, statuses_len, cat, NULL, 1);
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, cat, NULL, 1, 0);
 }
 
 void tl_list(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* list_id)
@@ -205,7 +207,7 @@ void tl_list(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* lis
     
     mastodont_timeline_list(api, &m_args, list_id, &args, &storage, &statuses, &statuses_len);
 
-    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_LISTS, "List timeline", 0);
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_LISTS, "List timeline", 0, 0);
 }
 
 
@@ -234,7 +236,7 @@ void tl_tag(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* tag_
 
     easprintf(&header, "Hashtag - #%s", tag_id);
 
-    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_NONE, header, 0);
+    content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_NONE, header, 0, 0);
     free(header);
 }
 
diff --git a/src/timeline.h b/src/timeline.h
index c2fd9f4..24017a7 100644
--- a/src/timeline.h
+++ b/src/timeline.h
@@ -86,6 +86,7 @@ void content_timeline(FCGX_Request* req,
                       size_t statuses_len,
                       enum base_category cat,
                       char* header,
-                      int show_post_box);
+                      int show_post_box,
+                      int fake_timeline);
 
 #endif // TIMELINE_H
diff --git a/templates/navigation.tt b/templates/navigation.tt
index a442c32..0d6e60e 100644
--- a/templates/navigation.tt
+++ b/templates/navigation.tt
@@ -2,6 +2,7 @@
     <tr>
         <td class="nav-up btn">
             <form action="" method="post">
+                <input type="hidden" name="only_media" value="[% IF ssn.post.only_media %]1[% ELSE %]0[% END %]">
                 <label class="pointer">
                     <span class="nav-btn">Up</span>
                     <input type="submit" class="hidden">
@@ -10,6 +11,7 @@
         </td>
         <td class="nav-prev btn">
             <form action="" method="post">
+                <input type="hidden" name="only_media" value="[% IF ssn.post.only_media %]1[% ELSE %]0[% END %]">
                 <label class="pointer">
                     [% UNLESS prev_id == start_id %]
                         <input type="hidden" name="start_id" value="[% start_id %]">
@@ -22,6 +24,7 @@
         </td>
         <td class="nav-next btn">
             <form action="" method="post">
+                <input type="hidden" name="only_media" value="[% IF ssn.post.only_media %]1[% ELSE %]0[% END %]">
                 <label class="pointer">
                     <input type="hidden" name="start_id" value="[% start_id %]">
                     <input type="hidden" name="max_id" value="[% next_id %]">
diff --git a/templates/timeline.tt b/templates/timeline.tt
index c21162c..dc3d35d 100644
--- a/templates/timeline.tt
+++ b/templates/timeline.tt
@@ -1,25 +1,31 @@
+[% IF title %]
+    <h1 class="text-header">$title</h1>
+[% END %]
+
 [% IF show_post_box %]
     [% postbox(ssn, data, undef) %]
 [% END %]
 
-<div class="menubar">
-  <form action="." method="post">
-    Only media:
-    <input type="checkbox" name="only_media" value="1" [% ssn.post.only_media %]>
-    <span class="bullet-separate">&bull;</span>
-    Replies: 
-    <select name="replies_only">
-      <option value="0">Show replies</option>
-      <option value="1">Self</option>
-      <option value="2">Following</option>
-    </select>
-    <input type="submit" class="btn btn-single" value="Filter">
-  </form>
-</div>
+[% UNLESS fake_timeline %]
+    <div class="menubar">
+        <form action="." method="post">
+            Only media:
+            <input type="checkbox" name="only_media" value="1" [% ssn.post.only_media %]>
+            <span class="bullet-separate">&bull;</span>
+            Replies: 
+            <select name="replies_only">
+                <option value="0">Show replies</option>
+                <option value="1">Self</option>
+                <option value="2">Following</option>
+            </select>
+            <input type="submit" class="btn btn-single" value="Filter">
+        </form>
+    </div>
+[% END %]
 
 [% FOREACH i IN statuses %]
     [% create_status(i) %]
 [% END %]
 
 [%# TODO navigation %]
-[% nav %]
+[% nav() %]

From 6534dd27aa86d44dbf16125be94774b42f0d2235 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 05:56:43 +0000
Subject: [PATCH 065/143] Accounts and accounts item template

FossilOrigin-Name: 248b2707f4670077651f40f93bb928b75e70ec33789025d0ef8fe239f7858bc8
---
 perl/account.pm           | 17 +++++++++++++++++
 src/global_perl.c         |  4 ++++
 templates/account_item.tt | 19 +++++++++++++++++++
 templates/accounts.tt     | 10 ++++++++++
 4 files changed, 50 insertions(+)
 create mode 100644 templates/account_item.tt
 create mode 100644 templates/accounts.tt

diff --git a/perl/account.pm b/perl/account.pm
index 51ac417..39755ff 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -48,3 +48,20 @@ sub content_statuses
 
     generate_account($ssn, $data, $acct, $relationship, to_template(\%vars, \$data->{'account_statuses.tt'}));
 }
+
+sub generate_account_item
+{
+    my ($ssn, $data, $account) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        account => $account,
+        # Functions
+        icon => \&get_icon,
+        lang => \&lang,
+        format_username => \&format_username,
+        );
+
+    to_template(\%vars, \$data->{'account_item.tt'});
+}
diff --git a/src/global_perl.c b/src/global_perl.c
index 688f71f..0992b2a 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -34,6 +34,8 @@
 #include "../templates/content_notifs.ctt"
 #include "../templates/content_lists.ctt"
 #include "../templates/navigation.ctt"
+#include "../templates/accounts.ctt"
+#include "../templates/account_item.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -58,6 +60,8 @@ void init_template_files(pTHX)
     hv_stores(template_files, "content_notifs.tt", newSVpv(data_content_notifs_tt, data_content_notifs_tt_size));
     hv_stores(template_files, "content_lists.tt", newSVpv(data_content_lists_tt, data_content_lists_tt_size));
     hv_stores(template_files, "navigation.tt", newSVpv(data_navigation_tt, data_navigation_tt_size));
+    hv_stores(template_files, "accounts.tt", newSVpv(data_accounts_tt, data_accounts_tt_size));
+    hv_stores(template_files, "account_item.tt", newSVpv(data_account_item_tt, data_account_item_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/templates/account_item.tt b/templates/account_item.tt
new file mode 100644
index 0000000..d51c068
--- /dev/null
+++ b/templates/account_item.tt
@@ -0,0 +1,19 @@
+<table class="account-stub">
+  <tr>
+    <td class="pfp-td">
+      <a href="/@[% account.acct %]"><img src="[% account.avatar %]"></a>
+    </td>
+    <td class="account-stub-info-wrapper">
+      <div class="account-stub-info">
+        <a href="/@[% account.acct %]">
+          <div class="account-stub-top">
+            <span class="username">[% format_username(account.display_name) %]</span>
+          </div>
+          <div class="account-stub-bottom">
+            <span class="instance-info">@[% account.acct %]</span>
+          </div>
+        </a>
+      </div>
+    </td>
+  </tr>
+</table>
diff --git a/templates/accounts.tt b/templates/accounts.tt
new file mode 100644
index 0000000..c9eda08
--- /dev/null
+++ b/templates/accounts.tt
@@ -0,0 +1,10 @@
+[% IF title %]
+    <h1 class="text-header">$title</h1>
+[% END %]
+
+[% FOREACH i IN accounts %]
+    [% create_account(i) %]
+[% END %]
+
+[%# TODO navigation %]
+[% nav() %]

From 4b696779aef1820f5db0daca314dcb31922fd811 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 06:12:35 +0000
Subject: [PATCH 066/143] Boilerplate for all the account lists

FossilOrigin-Name: 67c823fd5c5d45f87e8f3ae0413fd5ebfbaec4f522b35c0f9136d57d358e0db4
---
 src/account.c | 209 ++++++++++++++++++++++++++++++--------------------
 src/account.h |   3 +
 2 files changed, 130 insertions(+), 82 deletions(-)

diff --git a/src/account.c b/src/account.c
index c1fbf0a..0a3ff4e 100644
--- a/src/account.c
+++ b/src/account.c
@@ -107,14 +107,20 @@ char* construct_account_sidebar(struct mstdnt_account* acct, size_t* size)
     return result;
 }
 
-// TODO put account stuff into one function to cleanup a bit
-static char* account_followers_cb(HV* hv_session,
+static char* account_followers_cb(HV* session_hv,
                                   struct session* ssn,
                                   mastodont_t* api,
                                   struct mstdnt_account* acct,
                                   struct mstdnt_relationship* rel, 
                                   void* _args)
 {
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    struct mstdnt_storage storage = { 0 };
+    struct mstdnt_account* accounts = NULL;
+    size_t accts_len = 0;
+    char* result;
+    
     struct mstdnt_account_args args = {
         .max_id = keystr(ssn->post.max_id),
         .since_id = NULL,
@@ -123,52 +129,58 @@ static char* account_followers_cb(HV* hv_session,
         .limit = 20,
         .with_relationships = 0,
     };
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
-    char* accounts_html = NULL, *navigation_box = NULL;
-    char* output;
-    struct mstdnt_storage storage = { 0 };
-    struct mstdnt_account* accounts = NULL;
-    size_t accts_len = 0;
-    char* start_id;
     
-    if (mastodont_get_followers(api, &m_args, acct->id, &args, &storage, &accounts, &accts_len))
-    {
-        accounts_html = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        accounts_html = construct_accounts(api, accounts, accts_len, 0, NULL);
-        if (!accounts_html)
-            accounts_html = construct_error("No followers...", E_NOTICE, 1, NULL);
-    }
+    mastodont_get_followers(api, &m_args, acct->id, &args, &storage, &accounts, &accts_len);
 
-    if (accounts)
-    {
-        // If not set, set it
-        start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : accounts[0].id;
-        navigation_box = construct_navigation_box(start_id,
-                                                  accounts[0].id,
-                                                  accounts[accts_len-1].id,
-                                                  NULL);
-    }
-    easprintf(&output, "%s%s",
-              STR_NULL_EMPTY(accounts_html),
-              STR_NULL_EMPTY(navigation_box));
+    // TODO
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    if (rel)
+        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+    else ARG_UNDEFINED();
+    
+    if (accounts && accts_len)
+        XPUSHs(newRV_noinc((SV*)perlify_accounts(accounts, accts_len)));
+    else ARG_UNDEFINED();
+
+    PUTBACK;
+    call_pv("account::content_accounts", G_SCALAR);
+    SPAGAIN;
+    
+    result = savesharedsvpv(POPs);
+    
+    // Clean up Perl
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     mastodont_storage_cleanup(&storage);
     mstdnt_cleanup_accounts(accounts, accts_len);
-    if (accounts_html) free(accounts_html);
-    if (navigation_box) free(navigation_box);
-    return output;
+    return result;
 }
 
-static char* account_following_cb(HV* hv_session,
+static char* account_following_cb(HV* session_hv,
                                   struct session* ssn,
                                   mastodont_t* api,
                                   struct mstdnt_account* acct,
                                   struct mstdnt_relationship* rel, 
                                   void* _args)
 {
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
+    struct mstdnt_storage storage = { 0 };
+    struct mstdnt_account* accounts = NULL;
+    size_t accts_len = 0;
+    char* result;
+    
     struct mstdnt_account_args args = {
         .max_id = keystr(ssn->post.max_id),
         .since_id = NULL,
@@ -177,43 +189,42 @@ static char* account_following_cb(HV* hv_session,
         .limit = 20,
         .with_relationships = 0,
     };
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
-    char* accounts_html = NULL, *navigation_box = NULL;
-    char* output;
-    struct mstdnt_storage storage = { 0 };
-    struct mstdnt_account* accounts = NULL;
-    size_t accts_len = 0;
-    char* start_id;
     
-    if (mastodont_get_following(api, &m_args, acct->id, &args, &storage, &accounts, &accts_len))
-    {
-        accounts_html = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        accounts_html = construct_accounts(api, accounts, accts_len, 0, NULL);
-        if (!accounts_html)
-            accounts_html = construct_error("Not following anyone", E_NOTICE, 1, NULL);
-    }
+    mastodont_get_following(api, &m_args, acct->id, &args, &storage, &accounts, &accts_len);
 
-    if (accounts)
-    {
-        // If not set, set it
-        start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : accounts[0].id;
-        navigation_box = construct_navigation_box(start_id,
-                                                  accounts[0].id,
-                                                  accounts[accts_len-1].id,
-                                                  NULL);
-    }
-    easprintf(&output, "%s%s",
-              STR_NULL_EMPTY(accounts_html),
-              STR_NULL_EMPTY(navigation_box));
+    // TODO
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    if (rel)
+        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+    else ARG_UNDEFINED();
+    
+    if (accounts && accts_len)
+        XPUSHs(newRV_noinc((SV*)perlify_accounts(accounts, accts_len)));
+    else ARG_UNDEFINED();
+
+    PUTBACK;
+    call_pv("account::content_accounts", G_SCALAR);
+    SPAGAIN;
+    
+    result = savesharedsvpv(POPs);
+    
+    // Clean up Perl
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     mastodont_storage_cleanup(&storage);
     mstdnt_cleanup_accounts(accounts, accts_len);
-    if (accounts_html) free(accounts_html);
-    if (navigation_box) free(navigation_box);
-    return output;    
+    return result;    
 }
 
 static char* account_statuses_cb(HV* session_hv,
@@ -277,11 +288,13 @@ static char* account_scrobbles_cb(HV* session_hv,
                                   struct mstdnt_relationship* rel, 
                                   void* _args)
 {
-    (void)_args;
-    char* scrobbles_html = NULL;
+    struct mstdnt_args m_args;
+    set_mstdnt_args(&m_args, ssn);
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_scrobble* scrobbles = NULL;
     size_t scrobbles_len = 0;
+    char* result;
+
     struct mstdnt_get_scrobbles_args args = {
         .max_id = NULL,
         .min_id = NULL,
@@ -289,22 +302,40 @@ static char* account_scrobbles_cb(HV* session_hv,
         .offset = 0,
         .limit = 20
     };
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
+    mastodont_get_scrobbles(api, &m_args, acct->id, &args, &storage, &scrobbles, &scrobbles_len);
+
+    // TODO
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    if (rel)
+        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+    else ARG_UNDEFINED();
     
-    if (mastodont_get_scrobbles(api, &m_args, acct->id, &args, &storage, &scrobbles, &scrobbles_len))
-    {
-        scrobbles_html = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        scrobbles_html = construct_scrobbles(scrobbles, scrobbles_len, NULL);
-        if (!scrobbles_html)
-            scrobbles_html = construct_error("No scrobbles", E_NOTICE, 1, NULL);
-    }
+    if (scrobbles && scrobbles_len)
+        XPUSHs(newRV_noinc((SV*)perlify_scrobbles(scrobbles, scrobbles_len)));
+    else ARG_UNDEFINED();
+
+    PUTBACK;
+    call_pv("account::content_scrobbles", G_SCALAR);
+    SPAGAIN;
+    
+    result = savesharedsvpv(POPs);
+    
+    // Clean up Perl
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     mastodont_storage_cleanup(&storage);
-    free(scrobbles);
-    return scrobbles_html;
+    return result;
 }
 
 void get_account_info(mastodont_t* api, struct session* ssn)
@@ -800,6 +831,20 @@ void content_account_favourites(PATH_ARGS)
     content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_BOOKMARKS, "Favorites", 0, 1);
 }
 
+AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len)
+{
+    if (!(accounts && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_account(accounts + i)));
+    }
+
+    return av;
+}
+
 HV* perlify_account(const struct mstdnt_account* acct)
 {
     if (!acct) return NULL;
diff --git a/src/account.h b/src/account.h
index 3de5779..ab74ade 100644
--- a/src/account.h
+++ b/src/account.h
@@ -98,6 +98,9 @@ void content_account_favourites(PATH_ARGS);
 void content_account_bookmarks(PATH_ARGS);
 
 HV* perlify_account(const struct mstdnt_account* acct);
+AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len);
+HV* perlify_scrobble(const struct mstdnt_scrobble* scrobble);
+AV* perlify_scrobbles(const struct mstdnt_scrobble* scrobbles, size_t len)
 HV* perlify_relationship(const struct mstdnt_relationship* rel);
 
 #endif // ACCOUNT_H

From 6d46b56d549860e1e9140c0d6231a57113ba295d Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 06:16:21 +0000
Subject: [PATCH 067/143] Perlify scrobbles

FossilOrigin-Name: 8652ea3608a2a48af9f4915dd97732606cb8d5c5324821754472885d4f784a61
---
 src/account.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/account.c b/src/account.c
index 0a3ff4e..c862323 100644
--- a/src/account.c
+++ b/src/account.c
@@ -845,6 +845,36 @@ AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len)
     return av;
 }
 
+HV* perlify_scrobble(const struct mstdnt_scrobble* scrobble)
+{
+    if (!scrobble) return NULL;
+    HV* scrobble_hv = newHV();
+
+    hvstores_str(scrobble_hv, "account", perlify_account(scrobble->account));
+    hvstores_str(scrobble_hv, "album", scrobble->album);
+    hvstores_str(scrobble_hv, "artist", scrobble->artist);
+    hvstores_int(scrobble_hv, "created_at", scrobble->created_at);
+    hvstores_str(scrobble_hv, "id", scrobble->id);
+    hvstores_int(scrobble_hv, "length", scrobble->length);
+    hvstores_str(scrobble_hv, "title", scrobble->title);
+    
+    return scrobble_hv;
+}
+
+AV* perlify_scrobbles(const struct mstdnt_scrobble* scrobbles, size_t len)
+{
+    if (!(scrobbles && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_scrobble(scrobbles + i)));
+    }
+
+    return av;
+}
+
 HV* perlify_account(const struct mstdnt_account* acct)
 {
     if (!acct) return NULL;

From 15804cdf6136af854c4b7af398ab83b57f9e5e33 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 06:19:41 +0000
Subject: [PATCH 068/143] Fix warnings

FossilOrigin-Name: 2b6668ceae19377db2219ae451b496199a9dcef486a451857024d277269fda21
---
 src/account.c | 6 +++---
 src/account.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/account.c b/src/account.c
index c862323..b3d8bb5 100644
--- a/src/account.c
+++ b/src/account.c
@@ -850,7 +850,7 @@ HV* perlify_scrobble(const struct mstdnt_scrobble* scrobble)
     if (!scrobble) return NULL;
     HV* scrobble_hv = newHV();
 
-    hvstores_str(scrobble_hv, "account", perlify_account(scrobble->account));
+    hvstores_ref(scrobble_hv, "account", perlify_account(&(scrobble->account)));
     hvstores_str(scrobble_hv, "album", scrobble->album);
     hvstores_str(scrobble_hv, "artist", scrobble->artist);
     hvstores_int(scrobble_hv, "created_at", scrobble->created_at);
@@ -889,7 +889,7 @@ HV* perlify_account(const struct mstdnt_account* acct)
     hvstores_str(acct_hv, "avatar_static", acct->avatar_static);
     hvstores_str(acct_hv, "header", acct->header);
     hvstores_str(acct_hv, "header_static", acct->header_static);
-    hvstores_str(acct_hv, "created_at", acct->created_at);
+    hvstores_int(acct_hv, "created_at", acct->created_at);
     hvstores_str(acct_hv, "last_status_at", acct->last_status_at);
     hvstores_str(acct_hv, "mute_expires_at", acct->mute_expires_at);
     hvstores_int(acct_hv, "statuses_count", acct->statuses_count);
@@ -920,7 +920,7 @@ HV* perlify_relationship(const struct mstdnt_relationship* rel)
     hvstores_int(rel_hv, "notifying", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_NOTIFYING));
     hvstores_int(rel_hv, "blocking", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_BLOCKING));
     hvstores_int(rel_hv, "domain_blocking", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_DOMAIN_BLOCKING));
-    hvstores_str(rel_hv, "blocked_by", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_BLOCKED_BY));
+    hvstores_int(rel_hv, "blocked_by", MSTDNT_T_FLAG_ISSET(rel, MSTDNT_RELATIONSHIP_BLOCKED_BY));
 
     return rel_hv;
 }
diff --git a/src/account.h b/src/account.h
index ab74ade..6c3615f 100644
--- a/src/account.h
+++ b/src/account.h
@@ -100,7 +100,7 @@ void content_account_bookmarks(PATH_ARGS);
 HV* perlify_account(const struct mstdnt_account* acct);
 AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len);
 HV* perlify_scrobble(const struct mstdnt_scrobble* scrobble);
-AV* perlify_scrobbles(const struct mstdnt_scrobble* scrobbles, size_t len)
+AV* perlify_scrobbles(const struct mstdnt_scrobble* scrobbles, size_t len);
 HV* perlify_relationship(const struct mstdnt_relationship* rel);
 
 #endif // ACCOUNT_H

From 0504203df1153416472321cd32955a66c5ce7647 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 06:55:22 +0000
Subject: [PATCH 069/143] Fix notification read all

FossilOrigin-Name: e2f99021b7def56f6fbe347ecec3c1b5310d4b36c09261298054b462499e591c
---
 dist/treebird.css           | 10 ++++++++++
 src/notifications.c         |  3 ++-
 templates/content_notifs.tt |  5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index c94d4cb..bdb1a09 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -32,6 +32,11 @@ body
     height: 100%;
 }
 
+form
+{
+    display: inline;
+}
+
 /* Basic elements */
 h1, h2, h3, h4
 {
@@ -853,6 +858,7 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 {
     content:"";
     position: absolute;
+    z-index: 0;
     top: 0px;
     left: 0px;
     width: 15px;
@@ -864,6 +870,7 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 {
     content:"";
     position: absolute;
+    z-index: 0;
     top: 0px;
     left: 0px;
     width: 65px;
@@ -971,9 +978,11 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 
 .pfp-td
 {
+    position: relative;
     width: 52px;
     border-collapse: collapse !important;
     padding: 6px;
+    z-index: 1;
 }
 
 .pfp-td img
@@ -982,6 +991,7 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     width: 52px;
     height: 52px;
     object-fit: cover;
+    z-index: 1;
 }
 
 .status table tr
diff --git a/src/notifications.c b/src/notifications.c
index ca5915c..79a1429 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -365,7 +365,8 @@ void content_notifications_read(PATH_ARGS)
         mastodont_notifications_read(api, &m_args, &args, &storage, NULL);
     }
     else {
-        mastodont_notifications_read(api, &m_args, NULL, &storage, NULL);
+        struct mstdnt_notifications_args args = { .max_id = keystr(ssn->post.max_id) };
+        mastodont_notifications_read(api, &m_args, &args, &storage, NULL);
     }
 
     mastodont_storage_cleanup(&storage);
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index 8b9797f..9e7b2bd 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -3,7 +3,10 @@
     <div class="menubar">
         [% IF notifs %]
             <a class="btn btn-single btn-small" href="/notifications/clear">Clear notifications</a>
-            <a class="btn btn-single btn-small" href="/notifications/read">Mark as read</a>
+            <form action="/notifications/read" method="post">
+                <input type="hidden" name="max_id" value="[% notifs.0.id %]">
+                <input type="submit" class="btn btn-single btn-small" value="Mark as read">
+            </form>
         [% ELSE %]
             <span class="btn btn-single btn-small btn-disabled">Clear notifications</span>
             <span class="btn btn-single btn-small btn-disabled">Mark as read</span>

From 3ffbfb2f13acae5547feef2ba7315e57522d6391 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 13 Aug 2022 22:35:30 +0000
Subject: [PATCH 070/143] Refactormaxxxxx account lists, rewrite muted/blocked
 users

FossilOrigin-Name: e571d12a115516b8dea8a68ee3caa1272b102e10a4e0fb308df4e7556b8c30ec
---
 perl/account.pm           |  34 ++++++-
 perl/template_helpers.pm  |  18 +++-
 src/account.c             | 183 ++++++++++++++++----------------------
 templates/account_item.tt |   2 +-
 templates/accounts.tt     |   4 +-
 templates/timeline.tt     |   4 +-
 6 files changed, 132 insertions(+), 113 deletions(-)

diff --git a/perl/account.pm b/perl/account.pm
index 39755ff..d3c256a 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -10,7 +10,7 @@ our @EXPORT = qw( account content_statuses );
 use template_helpers 'to_template';
 use l10n 'lang';
 use status 'generate_status';
-use string_helpers qw( simple_escape emojify random_error_kaomoji );
+use string_helpers qw( simple_escape emojify random_error_kaomoji format_username );
 use navigation 'generate_navigation';
 
 sub generate_account
@@ -65,3 +65,35 @@ sub generate_account_item
 
     to_template(\%vars, \$data->{'account_item.tt'});
 }
+
+sub generate_account_list
+{
+    my ($ssn, $data, $accounts, $title) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        accounts => $accounts,
+        title => $title,
+        create_account => sub { generate_account_item($ssn, $data, shift); },
+        nav => sub { generate_navigation($ssn, $data, $accounts->[0]->{id}, $accounts->[-1]->{id}) },
+        );
+
+    to_template(\%vars, \$data->{'accounts.tt'});
+}
+
+sub content_accounts
+{
+    my ($ssn, $data, $acct, $relationship, $accounts, $title) = @_;
+    
+    my $acct_list_page = generate_account_list($ssn, $data, $accounts, $title);
+
+    # Should we create a full accounts view?
+    if ($acct)
+    {
+        generate_account($ssn, $data, $acct, $relationship, $acct_list_page);
+    }
+    else {
+        return $acct_list_page;
+    }
+}
diff --git a/perl/template_helpers.pm b/perl/template_helpers.pm
index 0e74d6a..748acc9 100644
--- a/perl/template_helpers.pm
+++ b/perl/template_helpers.pm
@@ -5,6 +5,8 @@ use Exporter 'import';
 
 our @EXPORT = qw( &to_template );
 
+use string_helpers 'simple_escape';
+
 my $template = Template->new(
     {
         INTERPOLATE => 1,
@@ -13,17 +15,27 @@ my $template = Template->new(
         TRIM => 1
     });
 
+sub pretty_error($)
+{
+    my $error = simple_escape(shift);
+    << "END_ERROR";
+<span class="e-error error-pad">
+      $error
+</span>
+END_ERROR
+}
+
 sub to_template
 {
     my ($vars, $data) = @_;
     my $result;
 
-    0 unless ref $data;
-    0 unless ref $vars;
+    return 0 unless ref $data;
+    return 0 unless ref $vars;
 
     # TODO HTML error formatting
     $template->process($data, $vars, \$result) ||
-        return $template->error();
+        return pretty_error($template->error());
 
     $result;
 }
diff --git a/src/account.c b/src/account.c
index b3d8bb5..7ecbc39 100644
--- a/src/account.c
+++ b/src/account.c
@@ -71,6 +71,57 @@ char* load_account_info(struct mstdnt_account* acct,
     return info_html;
 }
 
+static char* accounts_page(HV* session_hv,
+                           mastodont_t* api,
+                           struct mstdnt_account* acct,
+                           struct mstdnt_relationship* rel,
+                           char* header,
+                           struct mstdnt_storage* storage,
+                           struct mstdnt_account* accts,
+                           size_t accts_len)
+{
+    char* output;
+
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    if (acct)
+        XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    else ARG_UNDEFINED();
+    if (rel)
+        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+    else ARG_UNDEFINED();
+    
+    if (accts && accts_len)
+        XPUSHs(newRV_noinc((SV*)perlify_accounts(accts, accts_len)));
+    else ARG_UNDEFINED();
+
+    // perlapi doesn't specify if a string length of 0 calls strlen so calling just to be safe...
+    if (header)
+        mXPUSHp(header, strlen(header));
+
+    PUTBACK;
+    call_pv("account::content_accounts", G_SCALAR);
+    SPAGAIN;
+    
+    output = savesharedsvpv(POPs);
+    
+    // Clean up Perl
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
+
+    mastodont_storage_cleanup(storage);
+    mstdnt_cleanup_accounts(accts, accts_len);
+    return output;
+}
+
 char* construct_account_sidebar(struct mstdnt_account* acct, size_t* size)
 {
     char* result = NULL;
@@ -132,39 +183,7 @@ static char* account_followers_cb(HV* session_hv,
     
     mastodont_get_followers(api, &m_args, acct->id, &args, &storage, &accounts, &accts_len);
 
-    // TODO
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-
-    XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
-    if (rel)
-        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
-    else ARG_UNDEFINED();
-    
-    if (accounts && accts_len)
-        XPUSHs(newRV_noinc((SV*)perlify_accounts(accounts, accts_len)));
-    else ARG_UNDEFINED();
-
-    PUTBACK;
-    call_pv("account::content_accounts", G_SCALAR);
-    SPAGAIN;
-    
-    result = savesharedsvpv(POPs);
-    
-    // Clean up Perl
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
-
-    mastodont_storage_cleanup(&storage);
-    mstdnt_cleanup_accounts(accounts, accts_len);
-    return result;
+    return accounts_page(session_hv, api, acct, rel, NULL, &storage, accounts, accts_len);
 }
 
 static char* account_following_cb(HV* session_hv,
@@ -192,39 +211,7 @@ static char* account_following_cb(HV* session_hv,
     
     mastodont_get_following(api, &m_args, acct->id, &args, &storage, &accounts, &accts_len);
 
-    // TODO
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-
-    XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
-    if (rel)
-        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
-    else ARG_UNDEFINED();
-    
-    if (accounts && accts_len)
-        XPUSHs(newRV_noinc((SV*)perlify_accounts(accounts, accts_len)));
-    else ARG_UNDEFINED();
-
-    PUTBACK;
-    call_pv("account::content_accounts", G_SCALAR);
-    SPAGAIN;
-    
-    result = savesharedsvpv(POPs);
-    
-    // Clean up Perl
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
-
-    mastodont_storage_cleanup(&storage);
-    mstdnt_cleanup_accounts(accounts, accts_len);
-    return result;    
+    return accounts_page(session_hv, api, acct, rel, NULL, &storage, accounts, accts_len);
 }
 
 static char* account_statuses_cb(HV* session_hv,
@@ -280,7 +267,6 @@ static char* account_statuses_cb(HV* session_hv,
     return result;
 }
 
-
 static char* account_scrobbles_cb(HV* session_hv,
                                   struct session* ssn,
                                   mastodont_t* api,
@@ -734,41 +720,6 @@ void content_account_bookmarks(PATH_ARGS)
     content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_BOOKMARKS, "Bookmarks", 0, 1);
 }
 
-static void accounts_page(FCGX_Request* req,
-                          mastodont_t* api,
-                          struct session* ssn,
-                          struct mstdnt_storage* storage,
-                          char* header,
-                          struct mstdnt_account* accts,
-                          size_t accts_len)
-{
-    char* output;
-    char* content = construct_accounts(api, accts, accts_len, 0, NULL);
-    if (!content)
-        content = construct_error("No accounts here!", E_NOTICE, 1, NULL);
-    
-    struct basic_page_template tdata = {
-        .back_ref = getenv("HTTP_REFERER"),
-        .page_title = header,
-        .page_content = content,
-    };
-    output = tmpl_gen_basic_page(&tdata, NULL);
-
-    struct base_page b = {
-        .category = BASE_CAT_NONE,
-        .content = output,
-        .sidebar_left = NULL
-    };
-
-    // Output
-    render_base_page(&b, req, ssn, api);
-
-    mastodont_storage_cleanup(storage);
-    free(output);
-    free(content);
-}
-                                    
-
 void content_account_blocked(PATH_ARGS)
 {
     struct mstdnt_account_args args = {
@@ -787,8 +738,18 @@ void content_account_blocked(PATH_ARGS)
     
     mastodont_get_blocks(api, &m_args, &args, &storage, &accts, &accts_len);
 
-    accounts_page(req, api, ssn, &storage, "Blocked users", accts, accts_len);
-    mstdnt_cleanup_accounts(accts, accts_len);
+    HV* session_hv = perlify_session(ssn);
+    char* result = accounts_page(session_hv, api, NULL, NULL, "Blocked users", &storage, accts, accts_len);
+
+    struct base_page b = {
+        .category = BASE_CAT_NONE,
+        .content = result,
+        .session = session_hv,
+        .sidebar_left = NULL
+    };
+
+    render_base_page(&b, req, ssn, api);
+    free(result);
 }
 
 void content_account_muted(PATH_ARGS)
@@ -809,8 +770,18 @@ void content_account_muted(PATH_ARGS)
     
     mastodont_get_mutes(api, &m_args, &args, &storage, &accts, &accts_len);
 
-    accounts_page(req, api, ssn, &storage, "Muted users", accts, accts_len);
-    mstdnt_cleanup_accounts(accts, accts_len);
+    HV* session_hv = perlify_session(ssn);
+    char* result = accounts_page(session_hv, api, NULL, NULL, "Muted users", &storage, accts, accts_len);
+
+    struct base_page b = {
+        .category = BASE_CAT_NONE,
+        .content = result,
+        .session = session_hv,
+        .sidebar_left = NULL
+    };
+
+    render_base_page(&b, req, ssn, api);
+    free(result);
 }
 
 void content_account_favourites(PATH_ARGS)
diff --git a/templates/account_item.tt b/templates/account_item.tt
index d51c068..fc971eb 100644
--- a/templates/account_item.tt
+++ b/templates/account_item.tt
@@ -7,7 +7,7 @@
       <div class="account-stub-info">
         <a href="/@[% account.acct %]">
           <div class="account-stub-top">
-            <span class="username">[% format_username(account.display_name) %]</span>
+            <span class="username">[% format_username(account) %]</span>
           </div>
           <div class="account-stub-bottom">
             <span class="instance-info">@[% account.acct %]</span>
diff --git a/templates/accounts.tt b/templates/accounts.tt
index c9eda08..87e2bf3 100644
--- a/templates/accounts.tt
+++ b/templates/accounts.tt
@@ -7,4 +7,6 @@
 [% END %]
 
 [%# TODO navigation %]
-[% nav() %]
+[% IF accounts %]
+    [% nav() %]
+[% END %]
diff --git a/templates/timeline.tt b/templates/timeline.tt
index dc3d35d..86a2278 100644
--- a/templates/timeline.tt
+++ b/templates/timeline.tt
@@ -28,4 +28,6 @@
 [% END %]
 
 [%# TODO navigation %]
-[% nav() %]
+[% IF statuses %]
+    [% nav() %]
+[% END %]

From 5904362b1a33df9601692c4d5fbd26cd35893265 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 14 Aug 2022 05:37:49 +0000
Subject: [PATCH 071/143] Search all and searchbox tweaks

FossilOrigin-Name: 4130b59a244b1e0a82023c9e18f50ebe731348ecc06ad3b1df1e1390a455636c
---
 dist/svg/searchmenu.svg      |  1 +
 dist/treebird.css            | 13 +++++
 perl/account.pm              |  2 +-
 perl/icons.pm                |  4 ++
 perl/main.pl                 |  3 ++
 perl/search.pm               | 38 +++++++-------
 src/global_perl.c            |  8 +++
 src/search.c                 | 98 ++++++++++++++----------------------
 src/search.h                 |  2 +
 templates/content_search.tt  | 38 ++++++++++++++
 templates/main.tt            |  8 +--
 templates/search_accounts.tt |  0
 templates/search_statuses.tt |  0
 templates/search_tags.tt     |  0
 14 files changed, 132 insertions(+), 83 deletions(-)
 create mode 100644 dist/svg/searchmenu.svg
 create mode 100644 templates/content_search.tt
 create mode 100644 templates/search_accounts.tt
 create mode 100644 templates/search_statuses.tt
 create mode 100644 templates/search_tags.tt

diff --git a/dist/svg/searchmenu.svg b/dist/svg/searchmenu.svg
new file mode 100644
index 0000000..48ff143
--- /dev/null
+++ b/dist/svg/searchmenu.svg
@@ -0,0 +1 @@
+<svg width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="10.107" cy="8.7642" r="6.7391" stroke-width="1.6848"/><line x1="18.531" x2="14.866" y1="17.188" y2="13.524" stroke-width="1.6848"/><path d="m14.756 20.738 1.9607 1.9607 1.9091-1.9297" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6554"/></svg>
diff --git a/dist/treebird.css b/dist/treebird.css
index bdb1a09..b277ea0 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -258,6 +258,19 @@ table.ui-table td
     border-right: 1px solid #dadada;
 }
 
+#searchbox
+{
+    padding-left: 26px;
+}
+
+#navbar .searchbox-container .search-menu
+{
+    position: relative;
+    left: 30px;
+    top: 6px;
+    stroke: #606060;
+}
+
 #leftbar ul
 {
     margin: 0;
diff --git a/perl/account.pm b/perl/account.pm
index d3c256a..1570fd7 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -5,7 +5,7 @@ use Data::Dumper;
 
 use Exporter 'import';
 
-our @EXPORT = qw( account content_statuses );
+our @EXPORT = qw( account content_statuses generate_account_list generate_account_item );
 
 use template_helpers 'to_template';
 use l10n 'lang';
diff --git a/perl/icons.pm b/perl/icons.pm
index aab079f..9c7b627 100644
--- a/perl/icons.pm
+++ b/perl/icons.pm
@@ -44,6 +44,10 @@ sub get_icon_svg
         public => '<svg class="visibility vis-public" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>',
 
         follow => '<svg class="follow" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="20" y1="8" x2="20" y2="14"></line><line x1="23" y1="11" x2="17" y2="11"></line></svg>',
+
+        search => '<svg class="search" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>',
+
+        'search-menu' => '<svg class="search-menu" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="10.107" cy="8.7642" r="6.7391" stroke-width="1.6848"/><line x1="18.531" x2="14.866" y1="17.188" y2="13.524" stroke-width="1.6848"/><path d="m14.756 20.738 1.9607 1.9607 1.9091-1.9297" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6554"/></svg>',
         );
 
     $res{$_[0]};
diff --git a/perl/main.pl b/perl/main.pl
index 6d0c636..26b3577 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -6,9 +6,11 @@ use l10n qw( &lang %L10N );
 use notifications qw( generate_notification_compact content_notifications );
 use template_helpers qw( &to_template );
 use timeline;
+use icons 'get_icon';
 use status;
 use account;
 use lists;
+use search;
 
 # my $template = Template->new(
 #     {
@@ -32,6 +34,7 @@ sub base_page
         title => $L10N{'EN_US'}->{'APP_NAME'},
         lang => \&lang,
         main => $main,
+        icon => \&get_icon,
         sidebar_opacity => $ssn->{config}->{sidebar_opacity} / 255,
         acct => $ssn->{account},
         data => $data,
diff --git a/perl/search.pm b/perl/search.pm
index 09039f4..c1ccefc 100644
--- a/perl/search.pm
+++ b/perl/search.pm
@@ -6,6 +6,8 @@ use Exporter 'import';
 our @EXPORTS = qw( content_search search_tags search_accounts search_statuses );
 
 use template_helpers 'to_template';
+use status 'generate_status';
+use account 'generate_account_item';
 
 use constant
 {
@@ -28,33 +30,19 @@ sub search_page
     to_template(\%vars, \$data->{'search.tt'});
 }
 
-sub search_tags
-{
-    my ($ssn, $data, $tags) = @_;
-
-    my %vars = (
-        prefix => '',
-        ssn => $ssn,
-        statuses => $statuses,
-        );
-
-    search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_tags.tt'})); 
-}
-
 sub search_accounts
 {
-    my ($ssn, $data, $statuses) = @_;
+    my ($ssn, $data, $accounts) = @_;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
-        statuses => $statuses,
+        accounts => $accounts,
         );
 
-    search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_accounts.tt'})); 
+    search_page($ssn, $data, SEARCH_CAT_ACCOUNTS, to_template(\%vars, \$data->{'search_accounts.tt'})); 
 }
 
-
 sub search_statuses
 {
     my ($ssn, $data, $statuses) = @_;
@@ -68,6 +56,19 @@ sub search_statuses
     search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_statuses.tt'})); 
 }
 
+sub search_tags
+{
+    my ($ssn, $data, $tags) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        tags => $tags,
+        );
+
+    search_page($ssn, $data, SEARCH_CAT_TAGS, to_template(\%vars, \$data->{'search_tags.tt'})); 
+}
+
 sub content_search
 {
     my ($ssn, $data, $search) = @_;
@@ -76,6 +77,9 @@ sub content_search
         prefix => '',
         ssn => $ssn,
         search => $search,
+        
+        create_status => sub { generate_status($ssn, $data, shift); },
+        create_account => sub { generate_account_item($ssn, $data, shift); },
         );
 
     to_template(\%vars, \$data->{'content_search.tt'});
diff --git a/src/global_perl.c b/src/global_perl.c
index 0992b2a..29465c9 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -36,6 +36,10 @@
 #include "../templates/navigation.ctt"
 #include "../templates/accounts.ctt"
 #include "../templates/account_item.ctt"
+#include "../templates/content_search.ctt"
+#include "../templates/search_accounts.ctt"
+#include "../templates/search_statuses.ctt"
+#include "../templates/search_tags.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -62,6 +66,10 @@ void init_template_files(pTHX)
     hv_stores(template_files, "navigation.tt", newSVpv(data_navigation_tt, data_navigation_tt_size));
     hv_stores(template_files, "accounts.tt", newSVpv(data_accounts_tt, data_accounts_tt_size));
     hv_stores(template_files, "account_item.tt", newSVpv(data_account_item_tt, data_account_item_tt_size));
+    hv_stores(template_files, "content_search.tt", newSVpv(data_content_search_tt, data_content_search_tt_size));
+    hv_stores(template_files, "search_accounts.tt", newSVpv(data_search_accounts_tt, data_search_accounts_tt_size));
+    hv_stores(template_files, "search_statuses.tt", newSVpv(data_search_statuses_tt, data_search_statuses_tt_size));
+    hv_stores(template_files, "search_tags.tt", newSVpv(data_search_tags_tt, data_search_tags_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/search.c b/src/search.c
index 9ae2cbe..2700790 100644
--- a/src/search.c
+++ b/src/search.c
@@ -68,13 +68,6 @@ void content_search_all(PATH_ARGS)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    char* out_data = NULL;
-    char* statuses_html = NULL;
-    char* accounts_html = NULL;
-    char* tags_html = NULL,
-        * tags_graph = NULL,
-        * tags_bars = NULL,
-        * tags_page = NULL;
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_search_args args = {
         .account_id = NULL,
@@ -90,72 +83,43 @@ void content_search_all(PATH_ARGS)
     };
     struct mstdnt_search_results results = { 0 };
 
-    if (mastodont_search(api,
-                         &m_args,
-                         keystr(ssn->query.query),
-                         &storage,
-                         &args,
-                         &results) == 0)
-    {
-        // Statuses, make sure to set the highlight word
-        struct construct_statuses_args statuses_args = {
-            .highlight_word = keystr(ssn->query.query),
-        };
-        
-        statuses_html = construct_statuses(ssn, api, results.statuses, results.statuses_len, &statuses_args, NULL);
-        if (!statuses_html)
-            statuses_html = construct_error("No statuses", E_ERROR, 1, NULL);
+    mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
 
-        // Accounts
-        accounts_html = construct_accounts(api, results.accts, results.accts_len, 0, NULL);
-        if (!accounts_html)
-            accounts_html = construct_error("No accounts", E_ERROR, 1, NULL);
-
-        // Hashtags
-        tags_html = construct_hashtags(results.tags, results.tags_len, NULL);
-        if (!tags_html)
-            tags_html = construct_error("No hashtags", E_ERROR, 1, NULL);
-
-        tags_bars = construct_hashtags_graph(results.tags,
-                                             results.tags_len,
-                                             14,
-                                             NULL);
-        if (tags_bars)
-            tags_graph = construct_bar_graph_container(tags_bars, NULL);
-        
-        free(tags_bars);
-    }
-
-    easprintf(&tags_page, "%s%s", STR_NULL_EMPTY(tags_graph), tags_html);
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
     
-    // Construct search page
-    struct search_all_template tdata = {
-        .accounts = "Accounts",
-        .hashtags = "Hashtags",
-        .statuses = "Statuses",
-        .statuses_results = statuses_html,
-        .hashtags_results = tags_page,
-        .accounts_results = accounts_html
-    };
-    out_data = tmpl_gen_search_all(&tdata, NULL);
+    // ARGS
+    PUTBACK;
+    call_pv("search::content_search", G_SCALAR);
+    SPAGAIN;
+
+    // Duplicate so we can free the TMPs
+    char* dup = savesharedsvpv(POPs);
+
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     struct base_page b = {
         .category = BASE_CAT_NONE,
-        .content = out_data,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
-    // Output
     render_base_page(&b, req, ssn, api);
     
-    free(out_data);    
-    free(statuses_html);
-    free(accounts_html);
-    free(tags_html);
-    free(tags_graph);
-    free(tags_page);
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
+    Safefree(dup);
 }
 
 void content_search_statuses(PATH_ARGS)
@@ -299,3 +263,15 @@ void content_search_hashtags(PATH_ARGS)
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
 }
+
+HV* perlify_search_results(struct mstdnt_search_results* results)
+{
+    if (!results) return NULL;
+    
+    HV* search_hv = newHV();
+    hvstores_ref(search_hv, "accounts", perlify_accounts(results->accts, results->accts_len));
+    hvstores_ref(search_hv, "statuses", perlify_statuses(results->statuses, results->statuses_len));
+    // TODO tags
+
+    return search_hv;
+}
diff --git a/src/search.h b/src/search.h
index c7b013b..756de7c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -21,6 +21,7 @@
 #include <mastodont.h>
 #include "session.h"
 #include "path.h"
+#include "global_perl.h"
 
 enum search_tab
 {
@@ -38,5 +39,6 @@ void content_search_all(PATH_ARGS);
 void content_search_statuses(PATH_ARGS);
 void content_search_accounts(PATH_ARGS);
 void content_search_hashtags(PATH_ARGS);
+HV* perlify_search_results(struct mstdnt_search_results* results);
 
 #endif /* SEARCH_H */
diff --git a/templates/content_search.tt b/templates/content_search.tt
new file mode 100644
index 0000000..e8312ff
--- /dev/null
+++ b/templates/content_search.tt
@@ -0,0 +1,38 @@
+<table class="tabs ui-table">
+    <tr>
+        <td>
+            <label for="statuses-results-hidden">
+                <span class="tab-btn btn">Statuses</span>
+            </label>
+        </td>
+        <td>
+            <label for="accounts-results-hidden">
+                <span class="tab-btn btn">Accounts</span>
+            </label>
+        </td>
+        <td>
+            <label for="hashtags-results-hidden">
+                <span class="tab-btn btn">Hashtags</span>
+            </label>
+        </td>
+    </tr>
+</table>
+
+<div class="search-results">
+    <input type="radio" class="search-page-hidden hidden" id="statuses-results-hidden" name="searchpage" checked>
+    <div class="statuses-results search-page">
+        [% FOREACH i IN search.statuses %]
+            [% create_status(i); %]
+        [% END %]
+    </div>
+    <input type="radio" class="search-page-hidden hidden" id="accounts-results-hidden" name="searchpage">
+    <div class="accounts-results search-page">
+        [% FOREACH i IN search.accounts %]
+            [% create_account(i); %]
+        [% END %]        
+    </div>
+    <input type="radio" class="search-page-hidden hidden" id="hashtags-results-hidden" name="searchpage">
+    <div class="hashtags-results search-page">
+        TODO
+    </div>
+</div>
diff --git a/templates/main.tt b/templates/main.tt
index 3e63520..c3bf754 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -25,7 +25,7 @@
                 <label for="leftbar-show">
                     <svg class="leftbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
                 </label>
-                <a href="{{ %s : prefix }}/"><img src="/treebird_logo.png" height="42"></a>
+                <a href="$prefix/"><img src="/treebird_logo.png" height="42"></a>
                 <span class="info">$title</span>
                 <label for="rightbar-show">
                     <svg class="rightbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"></path></svg>
@@ -40,9 +40,9 @@
                             <a href="login" id="login-header">Login / Register</a>
                         [%- END %]
                         <!-- Searchbox -->
-                        <form action="{{ %s : prefix }}/search" method="get">
-                            <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><!-- i hate HTML
-                                                                                                                                                              --><input type="submit" class="btn group group-right" value="[% lang('SEARCH_BUTTON') %]">
+                        <form class="searchbox-container" action="$prefix/search" method="get">
+                            [% icon('search-menu') %]
+                            <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><input type="submit" class="btn group group-right" value="[% lang('SEARCH_BUTTON') %]">
                         </form>
                     </div>
                 </div>
diff --git a/templates/search_accounts.tt b/templates/search_accounts.tt
new file mode 100644
index 0000000..e69de29
diff --git a/templates/search_statuses.tt b/templates/search_statuses.tt
new file mode 100644
index 0000000..e69de29
diff --git a/templates/search_tags.tt b/templates/search_tags.tt
new file mode 100644
index 0000000..e69de29

From 6f0c959dc7bbeab7def85b184dec7cc0011e657e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 15 Aug 2022 03:06:46 +0000
Subject: [PATCH 072/143] Search dropdown menu

FossilOrigin-Name: 38a53150faceed277b933bde3edb37abb42d8d27c258d0a9b0564af9c8946773
---
 dist/treebird.css | 56 +++++++++++++++++++++++++++++++++++++++++++++--
 templates/main.tt | 41 +++++++++++++++++++++++++++++++++-
 2 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index b277ea0..562c4c0 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -260,15 +260,67 @@ table.ui-table td
 
 #searchbox
 {
-    padding-left: 26px;
+    padding-left: 27px;
 }
 
-#navbar .searchbox-container .search-menu
+#navbar .search-menu-dropdown
 {
+    display: inline;
     position: relative;
     left: 30px;
+    /* Fix weird offset */
+    margin-left: -30px;
     top: 6px;
+}
+
+.menu .btn-menu input[type=radio]
+{
+    display: none;
+}
+
+.menu .btn-menu input[type=radio] + span
+{
+    margin-left: 8px;
+    position: relative;
+}
+
+.menu .btn-menu input[type=radio]:checked + span:before
+{
+    position: absolute;
+    content: "";
+    left: -12px;
+    top: 5px;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background-color: #202020;
+    font-weight: bold;
+}
+
+.menu .btn-menu input[type=radio]:checked + span:before
+{
+    position: absolute;
+    content: "";
+    left: -12px;
+    top: 4px;
+    width: 4px;
+    height: 4px;
+    border-radius: 50%;
+    background-color: #202020;
+    font-weight: bold;
+}
+
+
+.menu.menu-compact .btn-menu
+{
+    font-size: 11px;
+}
+
+
+#navbar .search-menu-dropdown svg
+{
     stroke: #606060;
+    cursor: pointer;
 }
 
 #leftbar ul
diff --git a/templates/main.tt b/templates/main.tt
index c3bf754..6843430 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -41,7 +41,46 @@
                         [%- END %]
                         <!-- Searchbox -->
                         <form class="searchbox-container" action="$prefix/search" method="get">
-                            [% icon('search-menu') %]
+                            <span class="menu-container search-menu-dropdown">
+                                [% icon('search-menu') %]
+                                <div class="menu menu-options menu-compact">
+                                    <ul>
+                                        <li>
+                                            <label>
+                                                <div class="btn-menu">
+                                                    <input type="radio" name="searchtype" value="0" checked>
+                                                    <span>All</span>
+                                                </div>
+                                            </label>
+                                        </li>
+                                        <li>
+                                            <label>
+                                                <div class="btn-menu">
+                                                    <input type="radio" name="searchtype" value="0">
+                                                    <span>Statuses</span>
+                                                </div>
+                                            </label>
+                                        </li>
+                                        <li>
+                                            <label>
+                                                <div class="btn-menu">
+                                                    <input type="radio" name="searchtype" value="0">
+                                                    <span>Accounts</span>
+                                                </div>
+                                            </label>
+                                        </li>
+                                        <li>
+                                            <label>
+                                                <div class="btn-menu">
+                                                    <input type="radio" name="searchtype" value="0">
+                                                    <span>Hashtags</span>
+                                                </div>
+                                            </label>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </span>
+                                
                             <input type="text" class="group group-left group-inputbox" placeholder="[% lang('SEARCH_PLACEHOLDER') %]" id="searchbox" name="q"><input type="submit" class="btn group group-right" value="[% lang('SEARCH_BUTTON') %]">
                         </form>
                     </div>

From 71b636d77f7467016a2f884501e3510cc80a86d4 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 15 Aug 2022 03:58:30 +0000
Subject: [PATCH 073/143] Lists perlify , remove compact notifications CSS

FossilOrigin-Name: 6110d9f562673f233328fa5c5abd845c1ab1b3da5a314e94adb4d142287e70fa
---
 dist/treebird.css | 89 +----------------------------------------------
 src/lists.c       | 32 +++++++++++++++--
 src/lists.h       |  6 ++++
 3 files changed, 36 insertions(+), 91 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 562c4c0..c9ce27f 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -742,40 +742,6 @@ input[type=submit].post-btn
     object-fit: cover;
 }
 
-.notification-compact
-{
-    min-width: 100%;
-    padding: 3px;
-}
-
-.notification-compact p
-{
-    margin: 0;
-}
-
-.notification-compact .notification-content
-{
-    max-height: 100px;
-    overflow: auto;
-    margin-left: 2px;
-}
-
-.notification-compact .notification-info
-{
-    font-size: 12px;
-    padding-left: 2px;
-    padding-right: 2px;
-    margin-top: 0;
-    vertical-align: middle;
-    font-weight: bold;
-}
-
-.notification-compact .username .emoji
-{
-    width: 16px;
-    height: 16px;
-}
-
 .notification-info svg,
 .notification-info-format svg
 {
@@ -838,52 +804,12 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     display: none;
 }
 
-.notification-compact .notification-content
-{
-    color: #808080;
-    font-size: 12px;
-    padding: 4px 0 2px 0;
-}
-
-.notification-compact .notification-content.is-mention
-{
-    color: #101010;
-}
-
-.notification-compact .notification-stats
-{
-    font-size: 10px;
-}
-
-.notification-compact .notification-stats .status-interact
-{
-    margin-top: 2px;
-}
-
-.notification-compact .notification-stats svg
-{
-    width: 15px;
-    height: 15px;
-}
-
-.notification-compact .notification-stats .statbtn
-{
-    padding: 2px 4px;
-}
-
 .notification-info
 {
     margin-left: 28px;
     margin-bottom: 7px;
 }
 
-.notification-compact .notification-info
-{
-    margin-left: unset;
-    margin-bottom: unset;
-}
-
-
 .notification-info img.avatar,
 .notification-info .pfp-compact-td img,
 .notification-info-format .pfp-compact-td img
@@ -1073,13 +999,6 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     font-size: 10px;
 }
 
-.notification-compact .time:before
-{
-    content: "•";
-    padding-right: 10px;
-    font-size: 10px;
-}
-
 .status .time
 {
     margin-right: 4px;
@@ -1111,8 +1030,7 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
 }
 
 .status .time,
-.status .status-meta,
-.notification-compact .time
+.status .status-meta
 {
     color: #606060;
     font-size: 14px;
@@ -1769,11 +1687,6 @@ p}
     top: 5px;
 }
 
-.notification-compact .status-interact .statbtn
-{
-    min-width: 0px !important;
-}
-
 .status-interact svg
 {
     stroke: #303030;
diff --git a/src/lists.c b/src/lists.c
index 1433cb1..96e4c90 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -39,7 +39,7 @@ void content_lists(PATH_ARGS)
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
     struct mstdnt_list* lists = NULL;
-    size_t list_len = 0;
+    size_t lists_len = 0;
     struct mstdnt_storage storage = { 0 };
 
     if (ssn->post.title.is_set)
@@ -53,7 +53,7 @@ void content_lists(PATH_ARGS)
         mastodont_storage_cleanup(&create_storage);
     }
 
-    mastodont_get_lists(api, &m_args, &storage, &lists, &list_len);
+    mastodont_get_lists(api, &m_args, &storage, &lists, &lists_len);
 
     // Call perl
     perl_lock();
@@ -65,7 +65,7 @@ void content_lists(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    // TODO Perlify lists
+    XPUSHs(newRV_noinc((SV*)perlify_lists(lists, lists_len)));
     
     // ARGS
     PUTBACK;
@@ -118,3 +118,29 @@ void list_edit(PATH_ARGS)
     redirect(req, REDIRECT_303, referer);
     mastodont_storage_cleanup(&storage);
 }
+
+HV* perlify_list(struct mstdnt_list* list)
+{
+    if (!list) return NULL;
+
+    HV* list_hv = newHV();
+    hvstores_str(list_hv, "id", list->id);
+    hvstores_str(list_hv, "title", list->title);
+//    hvstores_int(list_hv, "replies_policy", list->replies_policy);
+
+    return list_hv;
+}
+
+AV* perlify_lists(const struct mstdnt_list* lists, size_t len)
+{
+    if (!(lists && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_list(lists + i)));
+    }
+
+    return av;
+}
diff --git a/src/lists.h b/src/lists.h
index 5414ce7..923c3d5 100644
--- a/src/lists.h
+++ b/src/lists.h
@@ -27,4 +27,10 @@ void content_lists(PATH_ARGS);
 /** Creates a list and then redirects */
 void list_edit(PATH_ARGS);
 
+/** Converts list to perl hash */
+HV* perlify_list(struct mstdnt_list* list);
+    
+/** Converts lists to perl array */
+AV* perlify_lists(const struct mstdnt_list* lists, size_t len);
+
 #endif // LISTS_H

From 992315411257e65b2f31b820ee35ec62e6c25387 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 15 Aug 2022 04:23:19 +0000
Subject: [PATCH 074/143] Show lists

FossilOrigin-Name: 10cb2fd50d3c08e5bf30109b35df1d3af4948f86d9b2099f716da30949f5b734
---
 dist/treebird.css          |  6 ------
 perl/lists.pm              |  4 +++-
 src/lists.c                |  2 +-
 src/lists.h                |  2 +-
 templates/content_lists.tt | 36 +++++++++++++++++++++++++++++++++++-
 5 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index c9ce27f..950ff59 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -828,12 +828,6 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     display: inline;
 }
 
-/* .notification-text-group-with-icon, */
-/* .notification-text-group */
-/* { */
-/*     vertical-align: middle; */
-/* } */
-
 .status.status-notification:not(.status-notification-mention) .status-content
 {
     color: #808080;
diff --git a/perl/lists.pm b/perl/lists.pm
index 40cec0e..8200115 100644
--- a/perl/lists.pm
+++ b/perl/lists.pm
@@ -11,7 +11,9 @@ sub content_lists
 {
     my ($ssn, $data, $lists) = @_;
 
-    my %vars = ();
+    my %vars = (
+        lists => $lists
+        );
 
     to_template(\%vars, \$data->{'content_lists.tt'});
 }
diff --git a/src/lists.c b/src/lists.c
index 96e4c90..e0e5d14 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -119,7 +119,7 @@ void list_edit(PATH_ARGS)
     mastodont_storage_cleanup(&storage);
 }
 
-HV* perlify_list(struct mstdnt_list* list)
+HV* perlify_list(const struct mstdnt_list* list)
 {
     if (!list) return NULL;
 
diff --git a/src/lists.h b/src/lists.h
index 923c3d5..9d55d84 100644
--- a/src/lists.h
+++ b/src/lists.h
@@ -28,7 +28,7 @@ void content_lists(PATH_ARGS);
 void list_edit(PATH_ARGS);
 
 /** Converts list to perl hash */
-HV* perlify_list(struct mstdnt_list* list);
+HV* perlify_list(const struct mstdnt_list* list);
     
 /** Converts lists to perl array */
 AV* perlify_lists(const struct mstdnt_list* lists, size_t len);
diff --git a/templates/content_lists.tt b/templates/content_lists.tt
index d3c5931..7053dce 100644
--- a/templates/content_lists.tt
+++ b/templates/content_lists.tt
@@ -1 +1,35 @@
-<h1>Lists</h1>
+<div class="lists-view">
+    <h1 class="lists-view-header">Lists</h1>
+
+    <div class="lists-view-container">
+        <ul class="large-list center">
+            [% FOREACH list IN lists %]
+                <li>
+                    <a href="/lists/for/[% list.id %]" class="btn split list-item">[% list.title %]</a><label for="list-edit-[% list.id %]"><span class="btn edit-list-btn">Edit</span></label>
+
+                    <input type="checkbox" id="list-edit-[% list.id %]" class="list-radio-show hidden" name="list-radio" class="hidden">
+                    <div class="list-edit-content">
+                        <form action="/lists/edit/[% list.id %]" method="post">
+                            <input type="text" name="title">
+                            <select name="replies_policy">
+                                <option value="0">None</option>
+                                <option value="1">List</option>
+                                <option value="2">Followed</option>
+                            </select>
+                        </form>
+                    </div>
+                </li>
+
+            [% END %]
+        </ul>
+
+        <ul class="large-list center create-list">
+            <form action="/lists" method="post">
+                <li>
+                    <input type="text" name="title" class="create-list-form"><input type="submit" value="Create list" class="create-list-btn btn">
+                </li>
+            </form>
+        </ul>
+    </div>
+</div>
+

From 2609b8d54f180cb9a38df79085ced64d7690c191 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 02:08:13 +0000
Subject: [PATCH 075/143] Seperate notifications logic, fix perl modules

FossilOrigin-Name: 8dedd9a9e0ca9f982140de1e980be166d07e9d549eae5cb50115fc3a7a414ae6
---
 perl/account.pm             |  2 ++
 perl/attachments.pm         |  1 +
 perl/chat.pm                |  1 +
 perl/emojis.pm              |  1 +
 perl/icons.pm               |  2 ++
 perl/main.pl                |  4 ++--
 perl/notifications.pm       | 20 +++++++++++++-------
 perl/status.pm              | 11 ++++++++++-
 src/global_perl.c           |  4 ++--
 templates/content_notifs.tt | 34 +---------------------------------
 templates/main.tt           | 16 +++++++++-------
 templates/notification.tt   | 33 +++++++++++++++++++++++++++++++++
 templates/status.tt         |  4 ++--
 13 files changed, 79 insertions(+), 54 deletions(-)
 create mode 100644 templates/notification.tt

diff --git a/perl/account.pm b/perl/account.pm
index 1570fd7..69d80a2 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -97,3 +97,5 @@ sub content_accounts
         return $acct_list_page;
     }
 }
+
+1;
diff --git a/perl/attachments.pm b/perl/attachments.pm
index 456deec..d7b2c13 100644
--- a/perl/attachments.pm
+++ b/perl/attachments.pm
@@ -23,3 +23,4 @@ sub generate_attachment
     to_template(\%vars, \$data->{'attachment.tt'});
 }
 
+1;
diff --git a/perl/chat.pm b/perl/chat.pm
index 533e090..560b7b7 100644
--- a/perl/chat.pm
+++ b/perl/chat.pm
@@ -33,3 +33,4 @@ sub content_chats
     to_template(\%vars, \$data->{'content_chats.tt'});
 }
 
+1;
diff --git a/perl/emojis.pm b/perl/emojis.pm
index 861ccea..0cb07d4 100644
--- a/perl/emojis.pm
+++ b/perl/emojis.pm
@@ -22,3 +22,4 @@ sub generate_emoji
     to_template(\%vars, \$data->{'emoji.tt'});
 }
 
+1;
diff --git a/perl/icons.pm b/perl/icons.pm
index 9c7b627..c0cfd39 100644
--- a/perl/icons.pm
+++ b/perl/icons.pm
@@ -69,3 +69,5 @@ sub visibility_to_icon
     # Assume local for anything else, because well... I'm not sure
     get_icon('local');
 }
+
+1;
diff --git a/perl/main.pl b/perl/main.pl
index 26b3577..9fd5806 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -3,7 +3,7 @@ use warnings;
 # Modules
 use Template;
 use l10n qw( &lang %L10N );
-use notifications qw( generate_notification_compact content_notifications );
+use notifications qw( generate_notification content_notifications );
 use template_helpers qw( &to_template );
 use timeline;
 use icons 'get_icon';
@@ -39,7 +39,7 @@ sub base_page
         acct => $ssn->{account},
         data => $data,
         notifs => $notifs,
-        notification_compact => \&generate_notification_compact,
+        notification => \&generate_notification,
         );
 
     to_template(\%vars, \$data->{'main.tt'});
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 869caa9..90e80f9 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -3,24 +3,29 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( generate_notification_compact content_notifications );
+our @EXPORT = qw( generate_notification content_notifications );
 
 use template_helpers 'to_template';
 use status 'generate_status';
 use string_helpers qw( random_error_kaomoji );
 use icons 'get_icon';
 
-sub generate_notification_compact
+sub generate_notification
 {
-    my ($ssn, $data, $notif) = @_;
+    my ($ssn, $data, $notif, $is_compact) = @_;
+
+    $is_compact ||= 0;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
-        notif => $notif
+        notif => $notif,
+        compact => $is_compact,
+        create_status => sub { generate_status($ssn, $data, shift, shift, $is_compact); },
+        icon => \&get_icon,
         );
 
-    to_template(\%vars, \$data->{'notif_compact.tt'});
+    to_template(\%vars, \$data->{'notification.tt'});
 }
 
 sub content_notifications
@@ -31,10 +36,11 @@ sub content_notifications
         prefix => '',
         ssn => $ssn,
         notifs => $notifs,
-        create_status => sub { generate_status($ssn, $data, shift, shift); },
-        icon => \&get_icon,
+        notification => sub { generate_notification($ssn, $data, shift); },
         random_error_kaomoji => \&random_error_kaomoji,
         );
     
     to_template(\%vars, \$data->{'content_notifs.tt'});
 }
+
+return 1;
diff --git a/perl/status.pm b/perl/status.pm
index b1c8178..2c0c8cd 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -13,9 +13,12 @@ our @EXPORT = qw( content_status generate_status );
 
 use template_helpers 'to_template';
 
+# Useful variable to prevent collisions
+my $rel_context = 0;
+
 sub generate_status
 {
-    my ($ssn, $data, $status, $notif) = @_;
+    my ($ssn, $data, $status, $notif, $is_compact) = @_;
     my $boost_acct;
 
     # Move status reference for boosts and keep account
@@ -33,7 +36,9 @@ sub generate_status
         boost => $boost_acct, # May be undef
         data => $data,
         notif => $notif, # May be undef
+        compact => $is_compact, # May be undef
         is_statusey_notif => ($notif && ($notif->{type} eq 'mention' || $notif->{type} eq 'status')),
+        unique_toggle_id => $rel_context++,
         # Functions
         icon => \&get_icon,
         lang => \&lang,
@@ -56,6 +61,8 @@ sub content_status
 {
     my ($ssn, $data, $status, $statuses_before, $statuses_after) = @_;
 
+    $rel_context = 0;
+
     my %vars = (
         prefix => '',
         ssn => $ssn,
@@ -70,3 +77,5 @@ sub content_status
 
     to_template(\%vars, \$data->{'content_status.tt'});
 }
+
+1;
diff --git a/src/global_perl.c b/src/global_perl.c
index 29465c9..0432cd5 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -20,7 +20,7 @@
 
 /* TODO let's generate this file dynamically with a Perl script? */
 #include "../templates/main.ctt"
-#include "../templates/notif_compact.ctt"
+#include "../templates/notification.ctt"
 #include "../templates/status.ctt"
 #include "../templates/content_status.ctt"
 #include "../templates/emoji_picker.ctt"
@@ -50,7 +50,7 @@ void init_template_files(pTHX)
     template_files = newHV();
 
     hv_stores(template_files, "main.tt", newSVpv(data_main_tt, data_main_tt_size));
-    hv_stores(template_files, "notif_compact.tt", newSVpv(data_notif_compact_tt, data_notif_compact_tt_size));
+    hv_stores(template_files, "notification.tt", newSVpv(data_notification_tt, data_notification_tt_size));
     hv_stores(template_files, "status.tt", newSVpv(data_status_tt, data_status_tt_size));
     hv_stores(template_files, "content_status.tt", newSVpv(data_content_status_tt, data_content_status_tt_size));
     hv_stores(template_files, "emoji_picker.tt", newSVpv(data_emoji_picker_tt, data_emoji_picker_tt_size));
diff --git a/templates/content_notifs.tt b/templates/content_notifs.tt
index 9e7b2bd..a616072 100644
--- a/templates/content_notifs.tt
+++ b/templates/content_notifs.tt
@@ -14,39 +14,7 @@
     </div>
     [% IF notifs %]
         [% FOREACH notif IN notifs %]
-            [%# There are 3 types of "different" notifications to render
-               - Mention, statuses (just regular statuses)
-               - Favorites, moves, reblogs, polls (no interaction buttons)
-               - Follows, follow requests
-               %]
-            [% IF notif.type == 'mention' ||
-               notif.type == 'status' ||
-               notif.type == 'favourite' ||
-               notif.type == 'reblog' ||
-               notif.type == 'emoji reaction' ||
-               notif.type == 'poll' %]
-                [% create_status(notif.status, notif) %]
-            [% ELSIF notif.type == 'follow' || notif.type == 'follow request' %]
-                <table class="notification notification-regular ui-table">
-                    <tr>
-                        <td class="pfp-td">
-                            <img src="[% notif.account.avatar %]" loading="lazy">
-                        </td>
-                        <td class="notification-info">
-                            <div class="notification-info-format">
-                                <span class="notification-text-group-with-icon">
-                                    <span title="[% notif.account.acct %]" class="username">[% notif.account.display_name %]</span>
-                                    <span class="action">followed</span>
-                                </span>
-                                [% icon('follow') %]
-                            </div>
-                            <div class="notification-content">
-                                <a href="/@[% notif.account.acct %]">@[% notif.account.acct %]</a>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-            [% END %]
+            [% notification(notif) %]
         [% END %]
     [% ELSE %]
         <div class="fancy-error">
diff --git a/templates/main.tt b/templates/main.tt
index 6843430..49db8c2 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -106,16 +106,16 @@
                         </ul>
                         
                         <ul class="sidebar-config">
-                            <li><a class="sidebarbtn-sub" href="{{%s:prefix}}/config/general">[% lang('GENERAL') %]</a></li>
-                            <li><a class="sidebarbtn-sub" href="{{%s:prefix}}/config/appearance">[% lang('APPEARANCE') %]</a></li>
+                            <li><a class="sidebarbtn-sub" href="$prefix/config/general">[% lang('GENERAL') %]</a></li>
+                            <li><a class="sidebarbtn-sub" href="$prefix/config/appearance">[% lang('APPEARANCE') %]</a></li>
                         </ul>
 
                         
                         <!-- <div class="static-html" id="instance-panel"></div> -->
                         <div class="mini-links">
-                            <a href="{{%s:prefix}}/about">About</a>
+                            <a href="$prefix/about">About</a>
                             <span class="bullet-separate">&bull;</span>
-                            <a href="{{%s:prefix}}/about/license">License</a>
+                            <a href="$prefix/about/license">License</a>
                             <span class="bullet-separate">&bull;</span>
                             <a href="https://fossil.nekobit.net/treebird">Source code</a>
                         </div>
@@ -169,9 +169,11 @@
                             </div>
 
                             <!-- Notifications -->
-                            [% FOREACH notif IN notifs %]
-                                [% notification_compact(ssn, data, notif) %]
-                            [% END %]
+                            <div class="notifications-compact">
+                                [% FOREACH notif IN notifs %]
+                                    [% notification(ssn, data, notif) %]
+                                [% END %]
+                            </div>
                             
                         [% ELSE %]
                             <div class="sidebar-login">
diff --git a/templates/notification.tt b/templates/notification.tt
new file mode 100644
index 0000000..f8e30d9
--- /dev/null
+++ b/templates/notification.tt
@@ -0,0 +1,33 @@
+[%# There are 3 types of "different" notifications to render
+   - Mention, statuses (just regular statuses)
+   - Favorites, moves, reblogs, polls (no interaction buttons)
+   - Follows, follow requests
+   %]
+[% IF notif.type == 'mention' ||
+   notif.type == 'status' ||
+   notif.type == 'favourite' ||
+   notif.type == 'reblog' ||
+   notif.type == 'emoji reaction' ||
+   notif.type == 'poll' %]
+    [% create_status(notif.status, notif) %]
+[% ELSIF notif.type == 'follow' || notif.type == 'follow request' %]
+    <table class="notification notification-regular ui-table">
+        <tr>
+            <td class="pfp-td">
+                <img src="[% notif.account.avatar %]" loading="lazy">
+            </td>
+            <td class="notification-info">
+                <div class="notification-info-format">
+                    <span class="notification-text-group-with-icon">
+                        <span title="[% notif.account.acct %]" class="username">[% notif.account.display_name %]</span>
+                        <span class="action">followed</span>
+                    </span>
+                    [% icon('follow') %]
+                </div>
+                <div class="notification-content">
+                    <a href="/@[% notif.account.acct %]">@[% notif.account.acct %]</a>
+                </div>
+            </td>
+        </tr>
+    </table>
+[% END %]
diff --git a/templates/status.tt b/templates/status.tt
index 501123e..6345f61 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -1,4 +1,4 @@
-<input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]"[% IF status.muted %] checked[% END %]>
+<input type="checkbox" class="status-hide" id="status-toggle-[% status.id %]-[% unique_toggle_id %]"[% IF status.muted %] checked[% END %]>
 <div class="status
             [%- IF notif %] status-notification[% IF notif.pleroma && !notif.pleroma.is_seen %] notification-unread[% END %][% END %]
             [%- IF is_statusey_notif -%] status-notification-mention[% END %]
@@ -84,7 +84,7 @@
                                 </ul>
                             </div>
                         </div>
-                        <label for="status-toggle-[% status.id %]" class="status-view"></label>
+                        <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
                     </span>
                 </div>
                 <div class="status-data">

From 399fe70f0820ffc24e8a5a2e3815d53e1fe78376 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 03:43:29 +0000
Subject: [PATCH 076/143] Compact notifications redo

FossilOrigin-Name: 4c93b6fae6df82cb2c199a5df3b964f217b7866a59e7ee9a08bd681548841175
---
 dist/treebird.css   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 perl/status.pm      | 21 ++++++++++++++++++++-
 templates/main.tt   |  2 +-
 templates/status.tt | 38 +++++++++++++++++++++-----------------
 4 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 950ff59..f76ad11 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -1104,6 +1104,50 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     min-width: 0;
 }
 
+/* Compact notifications (statuses) */
+.notifications-compact,
+.status-compact
+{
+    position: relative;
+    font-size: 14px;
+}
+
+.status-compact .status.status-notification
+{
+    padding: 7px;
+}
+
+.status-compact .pfp-td img
+{
+    width: 28px;
+    height: 28px;
+}
+
+.status-compact .action-icon
+{
+    position: absolute;
+    background-color: #eaecf0;
+    border-radius: 50%;
+    width: 14px;
+    height: 14px;
+    border: 1px solid #cacaca;
+    padding: 3px;
+    top: 17px;
+    left: -17px;
+    z-index: 8;
+    font-size: 12px;
+}
+
+.status-compact .action-icon svg
+{
+    width: 14px;
+    height: 14px;
+    stroke: #40455a;
+    /* Little fix */
+    position: relative;
+    top: -1px;
+}
+
 /* .status .notification-text-group-with-icon .username */
 /* { */
 /*     /\* UNDO *\/ */
diff --git a/perl/status.pm b/perl/status.pm
index 2c0c8cd..091b4ab 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -29,6 +29,8 @@ sub generate_status
         $status = $status->{reblog};
     }
 
+    my $is_statusey_notif = ($notif && ($notif->{type} eq 'mention' || $notif->{type} eq 'status'));
+
     my %vars = (
         prefix => '',
         ssn => $ssn,
@@ -37,9 +39,26 @@ sub generate_status
         data => $data,
         notif => $notif, # May be undef
         compact => $is_compact, # May be undef
-        is_statusey_notif => ($notif && ($notif->{type} eq 'mention' || $notif->{type} eq 'status')),
+        is_statusey_notif => $is_statusey_notif,
         unique_toggle_id => $rel_context++,
+        interacted_with => $boost_acct || ($notif && !$is_statusey_notif),
+
         # Functions
+        
+        action_to_string => sub {
+            return unless $notif;
+            return lang('NOTIF_LIKED') if $notif->{type} eq 'favourite';
+            return lang('NOTIF_REPEATED') if $boost_acct || $notif->{type} eq 'reblog';
+            return lang('NOTIF_REACTED_WITH') .' '. $notif->{emoji} if $boost_acct || $notif->{type} eq 'emoji reaction';
+        },
+        
+        action_to_icon => sub {
+            return unless $notif;
+            return get_icon('like') if $notif->{type} eq 'favourite';
+            return get_icon('repeat') if $boost_acct || $notif->{type} eq 'reblog';
+            return $notif->{emoji} if $notif->{type} eq 'emoji reaction';
+        },
+        
         icon => \&get_icon,
         lang => \&lang,
         rel_to_str => \&reltime_to_str,
diff --git a/templates/main.tt b/templates/main.tt
index 49db8c2..d4891cb 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -171,7 +171,7 @@
                             <!-- Notifications -->
                             <div class="notifications-compact">
                                 [% FOREACH notif IN notifs %]
-                                    [% notification(ssn, data, notif) %]
+                                    [% notification(ssn, data, notif, 1) %]
                                 [% END %]
                             </div>
                             
diff --git a/templates/status.tt b/templates/status.tt
index 6345f61..884bf3d 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -2,31 +2,21 @@
 <div class="status
             [%- IF notif %] status-notification[% IF notif.pleroma && !notif.pleroma.is_seen %] notification-unread[% END %][% END %]
             [%- IF is_statusey_notif -%] status-notification-mention[% END %]
+            [%- IF compact -%] status-compact[% END %]
             [%# Blame CSS for this class %]
-            [%- IF boost || (notif && notif.account && !is_statusey_notif) %] notification-info-lookahead[% END -%]
+            [%- IF interacted_with && !compact %] notification-info-lookahead[% END -%]
             " id="[% status.id %]">
-    [% IF boost || (notif && notif.account && !is_statusey_notif) %]
+    [% IF interacted_with && !compact %]
         <div class="notification-info">
             <img src="[% boost.avatar || notif.account.avatar %]" loading="lazy" class="avatar">
             <div class="notification-user">
                 <span class="notification-text-group-with-icon">
                     <span class="username">[% format_username(boost || notif.account) %]</span>
                     <span class="action">
-                        [% IF notif && notif.type == 'favourite' %]
-                            [% lang('NOTIF_LIKED') %]
-                        [% ELSIF boost || (notif && notif.type == 'reblog') %]
-                            [% lang('NOTIF_REPEATED') %]
-                        [% ELSIF boost || (notif && notif.type == 'emoji reaction') %]
-                            [%# Yes, it can be a custom emoji too %]
-                            [% lang('NOTIF_REACTED_WITH') %] [% notif.emoji %]
-                        [% END %]
+                        [% action_to_string(); %]
                     </span>
                 </span>
-                [% IF notif && notif.type == 'favourite' %]
-                    [% icon('like') %]
-                [% ELSIF boost || (notif && notif.type == 'reblog') %] [%# It's a repeat %]
-                    [% icon('repeat') %]
-                [% END %]
+                [% action_to_icon(); %]
             </div>
         </div>
     [% END %]
@@ -37,8 +27,22 @@
             </td>
             <td class="status-info">
                 <div class="poster-stats">
-                    <span class="username">[% format_username(status.account) %]</span>
-                    <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
+                    <span class="username">
+                        [% format_username(status.account) %]
+                    </span>
+                    
+                    [% IF interacted_with && compact %]
+                        <span class="action">
+                            [% action_to_string(); %]
+                        </span>
+                        <span class="action-icon">
+                            [% action_to_icon(); %]
+                        </span>
+                    [% END %]
+                    
+                    [% UNLESS compact %]
+                        <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
+                    [% END %]
                     <span class="alignend">
                         <div class="menu-container status-visibility">
                             [% vis_to_icon(status.visibility) %]

From 37f23ec3a29d143b79825f19ea1e731b9f9feaa0 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:08:48 +0000
Subject: [PATCH 077/143] Tweak small notifications more

FossilOrigin-Name: 9df6d19e067310f606cc0503f189584ef85186a49d506fbe869a41b3a1fd30d6
---
 dist/treebird.css   | 66 ++++++++++++++++++++++++++++++++++-----------
 templates/main.tt   |  2 +-
 templates/status.tt | 42 ++++++++++++++++-------------
 3 files changed, 76 insertions(+), 34 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index f76ad11..b92b83c 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -311,7 +311,8 @@ table.ui-table td
 }
 
 
-.menu.menu-compact .btn-menu
+.menu.menu-compact .btn-menu,
+.status-compact .menu-container .menu .btn-menu
 {
     font-size: 11px;
 }
@@ -1112,9 +1113,9 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     font-size: 14px;
 }
 
-.status-compact .status.status-notification
+.status-compact.status.status-notification
 {
-    padding: 7px;
+    padding: 5px;
 }
 
 .status-compact .pfp-td img
@@ -1128,31 +1129,66 @@ input[type=checkbox].hidden:not(:checked) + .reply-form
     position: absolute;
     background-color: #eaecf0;
     border-radius: 50%;
-    width: 14px;
-    height: 14px;
-    border: 1px solid #cacaca;
+    width: 16px;
+    height: 16px;
     padding: 3px;
-    top: 17px;
-    left: -17px;
+    top: 15px;
+    left: -15px;
     z-index: 8;
     font-size: 12px;
 }
 
 .status-compact .action-icon svg
 {
-    width: 14px;
-    height: 14px;
+    width: 16px;
+    height: 16px;
     stroke: #40455a;
     /* Little fix */
     position: relative;
     top: -1px;
 }
 
-/* .status .notification-text-group-with-icon .username */
-/* { */
-/*     /\* UNDO *\/ */
-/*     vertical-align: unset; */
-/* } */
+.status-compact .poster-stats .alignend
+{
+    background-color: rgb(234, 236, 240);
+    /* Hack - Fix the right padding regarding the icon being a little wider than it should */
+    padding: 1px 0px 1px 5px;
+}
+
+.status-compact .menu-container .menu
+{
+    margin-left: -80px;
+}
+
+.status-compact.notification-unread::before
+{
+    content:"";
+    position: absolute;
+    z-index: 0;
+    top: 0px;
+    left: 0px;
+    width: 10px;
+    height: 10px;
+    background: linear-gradient(135deg, rgba(255,0,0,1) 0%, rgba(0,0,0,0) 50%, rgba(0,0,0,0) 100%); 
+}
+
+.status-compact .in-reply-to-id
+{
+    font-size: 13px;
+}
+
+.status-compact .in-reply-to-icon
+{
+    width: 14px;
+    height: 14px;
+    /* Pixel perfect... */
+    top: -2px;
+}
+
+.status-compact .status-buttons
+{
+    float: initial;
+}
 
 .status .status-content
 {
diff --git a/templates/main.tt b/templates/main.tt
index d4891cb..dd6468a 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -43,7 +43,7 @@
                         <form class="searchbox-container" action="$prefix/search" method="get">
                             <span class="menu-container search-menu-dropdown">
                                 [% icon('search-menu') %]
-                                <div class="menu menu-options menu-compact">
+                                <div class="menu menu-search menu-compact">
                                     <ul>
                                         <li>
                                             <label>
diff --git a/templates/status.tt b/templates/status.tt
index 884bf3d..9b459f3 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -23,12 +23,14 @@
     <table class="status-table ui-table">
         <tr>
             <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
-                <img src="[% status.account.avatar %]" loading="lazy">
+                <img src="[% compact && interacted_with ?
+                             boost.account.avatar || notif.account.avatar : status.account.avatar %]" loading="lazy">
             </td>
             <td class="status-info">
                 <div class="poster-stats">
                     <span class="username">
-                        [% format_username(status.account) %]
+                        [% format_username(compact && interacted_with ?
+                            boost || notif.account : status.account) %]
                     </span>
                     
                     [% IF interacted_with && compact %]
@@ -88,14 +90,16 @@
                                 </ul>
                             </div>
                         </div>
-                        <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
+                        [% UNLESS compact %]
+                            <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
+                        [% END %]
                     </span>
                 </div>
                 <div class="status-data">
                     [%# Note: The id may actually (99.5% of the time) be the acct %]
                     [% IF status.in_reply_to_id %]
                         <span class="in-reply-to">
-                            <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> <span class="in-reply-to-text">In reply to</span> <span class="acct">[% status.pleroma.in_reply_to_account_acct || status.in_reply_to_account_id %]</span></a>
+                            <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> [% UNLESS compact %]<span class="in-reply-to-text">In reply to</span>[% END %] <span class="acct">[% status.pleroma.in_reply_to_account_acct || status.in_reply_to_account_id %]</span></a>
                         </span>
                     [% END %]
                     <span class="status-content">
@@ -132,7 +136,7 @@
                                 <input class="itype" type="hidden" name="itype" value="[% IF status.favourited %]un[% END %]like">
                                 <label class="pointer statbtn like-btn[% IF status.favourited %] interacted[% END %]">
                                     [% icon('like') %]
-                                    [% IF status.favourites_count %]
+                                    [% IF status.favourites_count && !compact %]
                                         <span class="count">[% status.favourites_count %]</span>
                                     [% END %]
                                     <input class="hidden" type="submit" value="Like">
@@ -142,7 +146,7 @@
                                 <input class="itype" type="hidden" name="itype" value="[% IF status.reblogged %]un[% END %]repeat">
                                 <label class="repeat-btn pointer statbtn[% IF status.reblogged %] interacted[% END %]">
                                     [% icon('repeat') %]
-                                    [% IF status.reblogs_count %]
+                                    [% IF status.reblogs_count && !compact %]
                                         <span class="count">[% status.reblogs_count %]</span>
                                     [% END %]
                                     <input class="hidden" type="submit" value="Repeat">
@@ -167,19 +171,21 @@
                         </div>
                         [% END %]
                         [%# Put these at the end, incase someone wants to move status icons to the beginning (this makes it easier %]
-                        <a target="_parent" href="$prefix/status/[% status.id %]#[% status.id %]" class="pointer statbtn view-btn">
-                            [% icon('expand') %]
-                        </a> 
-                        <span class="status-meta">
-                            <a href="#[% status.id %]" title="[% time_to_str(status.created_at) %]" class="time">[%- rel_to_str(status.created_at) -%]</a>
-                            [% IF status.application && status.application.name && !notif %]
-                                [% IF status.application.url %]
-                                    <a class="application-name" href="[% status.application.url %]">[% status.application.name %]</a>
-                                [% ELSE %]
-                                    <span class="application-name">[% status.application.name %]</span>
+                        [% UNLESS compact %]
+                            <a target="_parent" href="$prefix/status/[% status.id %]#[% status.id %]" class="pointer statbtn view-btn">
+                                [% icon('expand') %]
+                            </a> 
+                            <span class="status-meta">
+                                <a href="#[% status.id %]" title="[% time_to_str(status.created_at) %]" class="time">[%- rel_to_str(status.created_at) -%]</a>
+                                [% IF status.application && status.application.name && !notif %]
+                                    [% IF status.application.url %]
+                                        <a class="application-name" href="[% status.application.url %]">[% status.application.name %]</a>
+                                    [% ELSE %]
+                                        <span class="application-name">[% status.application.name %]</span>
+                                    [% END %]
                                 [% END %]
-                            [% END %]
-                        </span>
+                            </span>
+                        [% END %]
                     </div>
                 </div>
             </td>

From 242c11bf2842b1854d196960c2e3af2925ef521c Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:09:10 +0000
Subject: [PATCH 078/143] Offset menu search a little

FossilOrigin-Name: 31a518e7b282f4275d2e13f1e349518be473e52ca8dd4956a81c4d1563ab2410
---
 dist/treebird.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dist/treebird.css b/dist/treebird.css
index b92b83c..f54f6e5 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -2304,6 +2304,12 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
     display: block;
 }
 
+.menu.menu-search.menu-compact
+{
+    margin-left: -8px;
+    margin-top: -3px;
+}
+
 .user-options-btn
 {
     cursor: pointer;

From 177636a08a43ae4cd143372b1b989d7ecf381149 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:36:38 +0000
Subject: [PATCH 079/143] Show time on end

FossilOrigin-Name: e046337361a5fdbbd1c822c965126d133e88266c6907699bca16fae7f885752b
---
 dist/treebird.css   |  5 ++-
 templates/status.tt | 82 ++++++++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index f54f6e5..7253f15 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -317,7 +317,6 @@ table.ui-table td
     font-size: 11px;
 }
 
-
 #navbar .search-menu-dropdown svg
 {
     stroke: #606060;
@@ -2266,6 +2265,10 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
 }
 
 /* MENUS */
+
+/* Transition animations are possible with dropdown menus, e.g. fade, if you use 
+ * visibility: visible; instead of display:block; (and their counter values)
+ * but some things seemed buggy like the search dropdown, so try with care */
 .menu-container:hover .menu,
 .menu-container:hover + .menu
 {
diff --git a/templates/status.tt b/templates/status.tt
index 9b459f3..dae5da6 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -46,50 +46,56 @@
                         <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     [% END %]
                     <span class="alignend">
-                        <div class="menu-container status-visibility">
-                            [% vis_to_icon(status.visibility) %]
-                            <div class="menu">
-                                [% IF notif %]
+                        [% UNLESS notif && compact && interacted_with %]
+                            
+                            <div class="menu-container status-visibility">
+                                [% vis_to_icon(status.visibility) %]
+                                <div class="menu">
+                                    [% IF notif %]
+                                        <ul>
+                                            <li>
+                                                <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
+                                            </li>
+                                            <li>
+                                                <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
+                                            </li>
+                                        </ul>
+                                    [% END %]
                                     <ul>
                                         <li>
-                                            <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="mute">
+                                                <input type="submit" class="btn-menu" value="Mute">
+                                            </form>
                                         </li>
                                         <li>
-                                            <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="bookmark">
+                                                <input type="submit" class="btn-menu" value="Bookmark">
+                                            </form>
+                                        </li>
+                                        [%# pin %]
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="pin">
+                                                <input type="submit" class="btn-menu" value="Pin">
+                                            </form>
+                                        </li>
+                                        [%# Delete %]
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="delete">
+                                                <input type="submit" class="btn-menu" value="Delete status">
+                                            </form>
                                         </li>
-                                    </ul>
-                                [% END %]
-                                <ul>
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="mute">
-                                            <input type="submit" class="btn-menu" value="Mute">
-                                        </form>
-                                    </li>
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="bookmark">
-                                            <input type="submit" class="btn-menu" value="Bookmark">
-                                        </form>
-                                    </li>
-                                    [%# pin %]
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="pin">
-                                            <input type="submit" class="btn-menu" value="Pin">
-                                        </form>
-                                    </li>
-                                    [%# Delete %]
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="delete">
-                                            <input type="submit" class="btn-menu" value="Delete status">
-                                        </form>
-                                    </li>
 
-                                </ul>
+                                    </ul>
+                                </div>
                             </div>
-                        </div>
+                        [% ELSE %]
+                            <span class="time">[% rel_to_str(notif.created_at) %]</span>
+                        [% END %]
+                           
                         [% UNLESS compact %]
                             <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
                         [% END %]
@@ -97,7 +103,7 @@
                 </div>
                 <div class="status-data">
                     [%# Note: The id may actually (99.5% of the time) be the acct %]
-                    [% IF status.in_reply_to_id %]
+                    [% IF status.in_reply_to_id && !(compact && interacted_with) %]
                         <span class="in-reply-to">
                             <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> [% UNLESS compact %]<span class="in-reply-to-text">In reply to</span>[% END %] <span class="acct">[% status.pleroma.in_reply_to_account_acct || status.in_reply_to_account_id %]</span></a>
                         </span>

From 85c7e21d10285c2d0705a3cae6e80c40416883be Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:38:29 +0000
Subject: [PATCH 080/143] Switch type

FossilOrigin-Name: 9b1bc1e9501f783f858d7aaed5723370f3bb7300c5b13df20655a41bfd265270
---
 src/notifications.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/notifications.c b/src/notifications.c
index 79a1429..db85bda 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -393,7 +393,7 @@ HV* perlify_notification(struct mstdnt_notification* notif)
     HV* notif_hv = newHV();
 
     hvstores_str(notif_hv, "id", notif->id);
-    hvstores_str(notif_hv, "created_at", notif->created_at);
+    hvstores_int(notif_hv, "created_at", notif->created_at);
     hvstores_str(notif_hv, "emoji", notif->emoji);
     hvstores_str(notif_hv, "type", mstdnt_notification_t_to_str(notif->type));
     hvstores_ref(notif_hv, "account", perlify_account(notif->account));

From 93ba8c27376b18b938263c46d0973759c3ae3f99 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:41:10 +0000
Subject: [PATCH 081/143] Show notification menu options on the notif time

FossilOrigin-Name: cd21d4370f054729de3699367d004ff168fc39c51fb7097d6420559c20eddfb6
---
 templates/status.tt | 68 +++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/templates/status.tt b/templates/status.tt
index dae5da6..0f0b723 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -46,10 +46,13 @@
                         <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     [% END %]
                     <span class="alignend">
-                        [% UNLESS notif && compact && interacted_with %]
                             
                             <div class="menu-container status-visibility">
-                                [% vis_to_icon(status.visibility) %]
+                                [% UNLESS notif && compact && interacted_with %]
+                                    [% vis_to_icon(status.visibility) %]
+                                [% ELSE %]
+                                    <span class="time">[% rel_to_str(notif.created_at) %]</span>
+                                [% END %]
                                 <div class="menu">
                                     [% IF notif %]
                                         <ul>
@@ -61,40 +64,39 @@
                                             </li>
                                         </ul>
                                     [% END %]
-                                    <ul>
-                                        <li>
-                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                <input type="hidden" name="itype" value="mute">
-                                                <input type="submit" class="btn-menu" value="Mute">
-                                            </form>
-                                        </li>
-                                        <li>
-                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                <input type="hidden" name="itype" value="bookmark">
-                                                <input type="submit" class="btn-menu" value="Bookmark">
-                                            </form>
-                                        </li>
-                                        [%# pin %]
-                                        <li>
-                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                <input type="hidden" name="itype" value="pin">
-                                                <input type="submit" class="btn-menu" value="Pin">
-                                            </form>
-                                        </li>
-                                        [%# Delete %]
-                                        <li>
-                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                <input type="hidden" name="itype" value="delete">
-                                                <input type="submit" class="btn-menu" value="Delete status">
-                                            </form>
-                                        </li>
+                                    [% UNLESS notif && compact && interacted_with %]
+                                        <ul>
+                                            <li>
+                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                    <input type="hidden" name="itype" value="mute">
+                                                    <input type="submit" class="btn-menu" value="Mute">
+                                                </form>
+                                            </li>
+                                            <li>
+                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                    <input type="hidden" name="itype" value="bookmark">
+                                                    <input type="submit" class="btn-menu" value="Bookmark">
+                                                </form>
+                                            </li>
+                                            [%# pin %]
+                                            <li>
+                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                    <input type="hidden" name="itype" value="pin">
+                                                    <input type="submit" class="btn-menu" value="Pin">
+                                                </form>
+                                            </li>
+                                            [%# Delete %]
+                                            <li>
+                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                    <input type="hidden" name="itype" value="delete">
+                                                    <input type="submit" class="btn-menu" value="Delete status">
+                                                </form>
+                                            </li>
 
-                                    </ul>
+                                        </ul>
+                                    [% END %]
                                 </div>
                             </div>
-                        [% ELSE %]
-                            <span class="time">[% rel_to_str(notif.created_at) %]</span>
-                        [% END %]
                            
                         [% UNLESS compact %]
                             <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>

From a2848c5df2b73400fd4d009c7aa4489c286d1bcf Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:49:44 +0000
Subject: [PATCH 082/143] Fix reblog fake notification

FossilOrigin-Name: 01cffdb17769dbb6b711e8a3ff7d239b824714e7ba47e5563671b52bcf7401c4
---
 perl/status.pm      | 10 ++++------
 templates/status.tt |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/perl/status.pm b/perl/status.pm
index 091b4ab..48d65c1 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -46,17 +46,15 @@ sub generate_status
         # Functions
         
         action_to_string => sub {
-            return unless $notif;
-            return lang('NOTIF_LIKED') if $notif->{type} eq 'favourite';
+            return lang('NOTIF_LIKED') if $notif && $notif->{type} eq 'favourite';
             return lang('NOTIF_REPEATED') if $boost_acct || $notif->{type} eq 'reblog';
-            return lang('NOTIF_REACTED_WITH') .' '. $notif->{emoji} if $boost_acct || $notif->{type} eq 'emoji reaction';
+            return lang('NOTIF_REACTED_WITH') .' '. $notif->{emoji} if $notif->{type} eq 'emoji reaction';
         },
         
         action_to_icon => sub {
-            return unless $notif;
-            return get_icon('like') if $notif->{type} eq 'favourite';
+            return get_icon('like') if $notif && $notif->{type} eq 'favourite';
             return get_icon('repeat') if $boost_acct || $notif->{type} eq 'reblog';
-            return $notif->{emoji} if $notif->{type} eq 'emoji reaction';
+            return $notif->{emoji} if $notif && $notif->{type} eq 'emoji reaction';
         },
         
         icon => \&get_icon,
diff --git a/templates/status.tt b/templates/status.tt
index 0f0b723..05958f5 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -13,10 +13,10 @@
                 <span class="notification-text-group-with-icon">
                     <span class="username">[% format_username(boost || notif.account) %]</span>
                     <span class="action">
-                        [% action_to_string(); %]
+                        [% action_to_string() %]
                     </span>
                 </span>
-                [% action_to_icon(); %]
+                [% action_to_icon() %]
             </div>
         </div>
     [% END %]
@@ -35,10 +35,10 @@
                     
                     [% IF interacted_with && compact %]
                         <span class="action">
-                            [% action_to_string(); %]
+                            [% action_to_string() %]
                         </span>
                         <span class="action-icon">
-                            [% action_to_icon(); %]
+                            [% action_to_icon() %]
                         </span>
                     [% END %]
                     

From 35982e5caa1cd3e42db827708303908a75e8e320 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 15:28:58 +0000
Subject: [PATCH 083/143] ???

FossilOrigin-Name: 0bb1cb9d1808c11b716f644ba0bc150af5fe86efd95153e447a3a8c9073f0e31
---
 src/login.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/login.c b/src/login.c
index 0bc74d9..6fd8bfe 100644
--- a/src/login.c
+++ b/src/login.c
@@ -84,7 +84,7 @@ void content_login_oauth(PATH_ARGS)
         m_args.url = decode_url;
         
         struct mstdnt_application_args args_app = {
-            .client_name = "DESU",
+            .client_name = "Treebird",
             .redirect_uris = urlify_redirect_url,
             .scopes = "read+write+follow+push",
             .website = keystr(ssn->post.instance)

From 2aa34fea2a4a3281b8d05c021953896f83beddc9 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 21:20:07 +0000
Subject: [PATCH 084/143] perlify_chat(s)

FossilOrigin-Name: f77180996ce3b881a0395c015338668fb1db76af35329591c8174ded6803a87e
---
 src/conversations.c        | 63 ++++++++++++++++++++++++++++++--------
 src/conversations.h        |  3 ++
 templates/content_chats.tt |  5 +++
 3 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 templates/content_chats.tt

diff --git a/src/conversations.c b/src/conversations.c
index effb6d1..440e70e 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdlib.h>
+#include "account.h"
 #include "../config.h"
 #include "conversations.h"
 #include "helpers.h"
@@ -163,8 +164,6 @@ void content_chats(PATH_ARGS)
     struct mstdnt_chat* chats = NULL;
     size_t chats_len = 0;
     struct mstdnt_storage storage = { 0 };
-    char* chats_page = NULL;
-    char* chats_html = NULL;
 
     struct mstdnt_chats_args args = {
         .with_muted = MSTDNT_TRUE,
@@ -175,20 +174,34 @@ void content_chats(PATH_ARGS)
         .limit = 20,
     };
 
-    if (mastodont_get_chats_v2(api, &m_args, &args, &storage, &chats, &chats_len))
-    {
-        chats_page = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        chats_html = construct_chats(api, &m_args, chats, chats_len, NULL);
-        if (!chats_html)
-            chats_html = construct_error("No chats", E_NOTICE, 1, NULL);
-        chats_page = construct_chats_view(chats_html, NULL);
-    }
+    mastodont_get_chats_v2(api, &m_args, &args, &storage, &chats, &chats_len);
+
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_chats(&chats, chats_len)));
+    // ARGS
+    PUTBACK;
+    call_pv("chat::content_chats", G_SCALAR);
+    SPAGAIN;
+
+    // Duplicate so we can free the TMPs
+    char* dup = savesharedsvpv(POPs);
+
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     struct base_page b = {
         .category = BASE_CAT_CHATS,
         .content = chats_page,
+        .session = session_hv,
         .sidebar_left = NULL
     };
     
@@ -293,3 +306,29 @@ void content_chat_embed(PATH_ARGS)
     free(result);
 }
 
+HV* perlify_chat(const struct mstdnt_chat* chat)
+{
+    if (!chat) return NULL;
+
+    HV* chat_hv = newHV();
+    hvstores_ref(chat_hv, "account", perlify_account(&(chat->account)));
+    hvstores_str(chat_hv, "id", chat->id);
+    hvstores_int(chat_hv, "unread", chat->unread);
+
+    return chat_hv;
+}
+
+AV* perlify_chats(const struct mstdnt_chat* chats, size_t len)
+{
+    if (!(chats && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_chat(chats + i)));
+    }
+
+    return av;
+}
+
diff --git a/src/conversations.h b/src/conversations.h
index 18ffb37..b1cf1da 100644
--- a/src/conversations.h
+++ b/src/conversations.h
@@ -49,4 +49,7 @@ char* construct_chat_view(struct session* ssn, mastodont_t* api, char* id, size_
 void content_chat_embed(PATH_ARGS);
 void content_chat_view(PATH_ARGS);
 
+AV* perlify_chats(const struct mstdnt_chat* chats, size_t chats_len);
+HV* perlify_chat(const struct mstdnt_chat* chat);
+
 #endif // LISTS_H
diff --git a/templates/content_chats.tt b/templates/content_chats.tt
new file mode 100644
index 0000000..45a255c
--- /dev/null
+++ b/templates/content_chats.tt
@@ -0,0 +1,5 @@
+<h1 class="text-header">Chats</h1>
+
+[% FOREACH chat IN chats %]
+    [% make_chat(chat) %]
+[% END %]

From ce74e7125ee5d01110cf49a0b7df0f1809b39a66 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 21:35:11 +0000
Subject: [PATCH 085/143] Chats

FossilOrigin-Name: 54a80dceb8d34d72d13ae4adc77229d8293fed346908ea4d5fdbac6c4c916b67
---
 perl/chat.pm               |  2 ++
 perl/main.pl               |  1 +
 src/conversations.c        |  7 +++----
 src/global_perl.c          |  4 ++++
 templates/chat.tt          |  1 +
 templates/content_chats.tt | 20 +++++++++++++++++++-
 6 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 templates/chat.tt

diff --git a/perl/chat.pm b/perl/chat.pm
index 560b7b7..145fdb1 100644
--- a/perl/chat.pm
+++ b/perl/chat.pm
@@ -6,6 +6,7 @@ use Exporter 'import';
 our @EXPORTS = qw( content_chats );
 
 use template_helpers 'to_template';
+use string_helpers 'format_username';
 
 sub construct_chat
 {
@@ -28,6 +29,7 @@ sub content_chats
         prefix => '',
         ssn => $ssn,
         chats => $chats,
+        format_username => \&format_username,
         );
 
     to_template(\%vars, \$data->{'content_chats.tt'});
diff --git a/perl/main.pl b/perl/main.pl
index 9fd5806..2805691 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -11,6 +11,7 @@ use status;
 use account;
 use lists;
 use search;
+use chat;
 
 # my $template = Template->new(
 #     {
diff --git a/src/conversations.c b/src/conversations.c
index 440e70e..265a912 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -184,7 +184,7 @@ void content_chats(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_chats(&chats, chats_len)));
+    XPUSHs(newRV_noinc((SV*)perlify_chats(chats, chats_len)));
     // ARGS
     PUTBACK;
     call_pv("chat::content_chats", G_SCALAR);
@@ -200,7 +200,7 @@ void content_chats(PATH_ARGS)
 
     struct base_page b = {
         .category = BASE_CAT_CHATS,
-        .content = chats_page,
+        .content = dup,
         .session = session_hv,
         .sidebar_left = NULL
     };
@@ -210,9 +210,8 @@ void content_chats(PATH_ARGS)
 
     // Cleanup
     mastodont_storage_cleanup(&storage);
-    free(chats_page);
-    free(chats_html);
     // TOOD cleanup chats
+    Safefree(dup);
 }
 
 char* construct_chat_view(struct session* ssn, mastodont_t* api, char* id, size_t* len)
diff --git a/src/global_perl.c b/src/global_perl.c
index 0432cd5..5556418 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -40,6 +40,8 @@
 #include "../templates/search_accounts.ctt"
 #include "../templates/search_statuses.ctt"
 #include "../templates/search_tags.ctt"
+#include "../templates/content_chats.ctt"
+#include "../templates/chat.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -70,6 +72,8 @@ void init_template_files(pTHX)
     hv_stores(template_files, "search_accounts.tt", newSVpv(data_search_accounts_tt, data_search_accounts_tt_size));
     hv_stores(template_files, "search_statuses.tt", newSVpv(data_search_statuses_tt, data_search_statuses_tt_size));
     hv_stores(template_files, "search_tags.tt", newSVpv(data_search_tags_tt, data_search_tags_tt_size));
+    hv_stores(template_files, "content_chats.tt", newSVpv(data_content_chats_tt, data_content_chats_tt_size));
+    hv_stores(template_files, "chat.tt", newSVpv(data_chat_tt, data_chat_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/templates/chat.tt b/templates/chat.tt
new file mode 100644
index 0000000..76cadc9
--- /dev/null
+++ b/templates/chat.tt
@@ -0,0 +1 @@
+chat
diff --git a/templates/content_chats.tt b/templates/content_chats.tt
index 45a255c..97d2b92 100644
--- a/templates/content_chats.tt
+++ b/templates/content_chats.tt
@@ -1,5 +1,23 @@
 <h1 class="text-header">Chats</h1>
 
 [% FOREACH chat IN chats %]
-    [% make_chat(chat) %]
+    <a href="/chats/[% chat.id %]">
+        <table class="contact">
+            <tr>
+                <td class="pfp-td">
+                    <img src="[% chat.account.avatar %]">
+                </td>
+                <td class="contact-right-td">
+                    <div class="contact-right">
+                        <div class="contact-info">
+                            <span class="username" title="[% chat.account.acct %]">[% format_username(chat.account) %]</span>
+                        </div>
+                        <div class="last-message">
+                            <span class="chat-msg-preview">Chat message</span>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </a>
 [% END %]

From eac2f53aad3c942994c3a91b7819e9f45c2d7e59 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 21:38:28 +0000
Subject: [PATCH 086/143] perlify_message(s)

FossilOrigin-Name: ac178b0d18e84d776b7f6ce8ffad5ad900a3d5af9dbdfca4a137d2e9ae5bf1f0
---
 src/conversations.c | 31 +++++++++++++++++++++++++++++++
 src/conversations.h |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/src/conversations.c b/src/conversations.c
index 265a912..4311222 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include "account.h"
+#include "emoji.h"
 #include "../config.h"
 #include "conversations.h"
 #include "helpers.h"
@@ -331,3 +332,33 @@ AV* perlify_chats(const struct mstdnt_chat* chats, size_t len)
     return av;
 }
 
+HV* perlify_message(const struct mstdnt_message* message)
+{
+    if (!message) return NULL;
+
+    HV* message_hv = newHV();
+    hvstores_str(message_hv, "account_id", message->account_id);
+    hvstores_str(message_hv, "chat_id", message->chat_id);
+    hvstores_str(message_hv, "id", message->id);
+    hvstores_str(message_hv, "content", message->content);
+    hvstores_int(message_hv, "created_at", message->created_at);
+    hvstores_ref(message_hv, "emojis", perlify_emojis(message->emojis, message->emojis_len));
+    hvstores_int(message_hv, "unread", message->unread);
+
+    return message_hv;
+}
+
+AV* perlify_messages(const struct mstdnt_message* messages, size_t len)
+{
+    if (!(messages && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
+
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_message(messages + i)));
+    }
+
+    return av;
+}
+
diff --git a/src/conversations.h b/src/conversations.h
index b1cf1da..fb988ca 100644
--- a/src/conversations.h
+++ b/src/conversations.h
@@ -52,4 +52,7 @@ void content_chat_view(PATH_ARGS);
 AV* perlify_chats(const struct mstdnt_chat* chats, size_t chats_len);
 HV* perlify_chat(const struct mstdnt_chat* chat);
 
+AV* perlify_messages(const struct mstdnt_message* messages, size_t messages_len);
+HV* perlify_message(const struct mstdnt_message* message);
+
 #endif // LISTS_H

From c9ec49af9fd1de4d52dbf8d4270f4f0388797bec Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 02:08:59 +0000
Subject: [PATCH 087/143] Chats C perl

FossilOrigin-Name: 569bf19f47d6b4b64712a226fa0b60c8dc6d3d7db31f2fd3c49ced9c75bc1646
---
 perl/chat.pm        |  5 +--
 src/conversations.c | 88 +++++++++++++++------------------------------
 src/conversations.h |  2 --
 src/main.c          |  1 -
 4 files changed, 32 insertions(+), 64 deletions(-)

diff --git a/perl/chat.pm b/perl/chat.pm
index 145fdb1..9a3b64b 100644
--- a/perl/chat.pm
+++ b/perl/chat.pm
@@ -3,19 +3,20 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORTS = qw( content_chats );
+our @EXPORTS = qw( content_chats construct_chat );
 
 use template_helpers 'to_template';
 use string_helpers 'format_username';
 
 sub construct_chat
 {
-    my ($ssn, $data, $chat) = @_;
+    my ($ssn, $data, $chat, $messages) = @_;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
         chat => $chat,
+        messages => $messages,
         );
 
     to_template(\%vars, \$data->{'chat.tt'});
diff --git a/src/conversations.c b/src/conversations.c
index 4311222..76cb81a 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -215,7 +215,7 @@ void content_chats(PATH_ARGS)
     Safefree(dup);
 }
 
-char* construct_chat_view(struct session* ssn, mastodont_t* api, char* id, size_t* len)
+void content_chat_view(PATH_ARGS)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
@@ -224,9 +224,6 @@ char* construct_chat_view(struct session* ssn, mastodont_t* api, char* id, size_
     size_t messages_len = 0;
     struct mstdnt_storage storage = { 0 }, storage_chat = { 0 };
     struct mstdnt_chat chat;
-    struct mstdnt_storage acct_storage = { 0 };
-    char* chats_page = NULL;
-    char* messages_html = NULL;
 
     struct mstdnt_chats_args args = {
         .with_muted = MSTDNT_TRUE,
@@ -237,73 +234,46 @@ char* construct_chat_view(struct session* ssn, mastodont_t* api, char* id, size_
         .limit = 20,
     };
     
-    if (len) *len = 0;
+    mastodont_get_chat_messages(api, &m_args, data[0], &args, &storage, &messages, &messages_len);
+    mastodont_get_chat(api, &m_args, data[0],
+                       &storage_chat, &chat);
 
-    if (mastodont_get_chat_messages(api, &m_args, id,
-                                    &args, &storage, &messages, &messages_len) ||
-        mastodont_get_chat(api, &m_args, id,
-                           &storage_chat, &chat))
-    {
-        chats_page = construct_error(storage.error, E_ERROR, 1, NULL);
-    }
-    else {
-        messages_html = construct_messages(messages, &(ssn->acct), &(chat.account), messages_len, NULL);
-        if (!messages_html)
-            messages_html = construct_error("This is the start of something new...", E_NOTICE, 1, NULL);
+    perl_lock();
+    dSP;
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(SP);
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
+    XPUSHs(newRV_noinc((SV*)perlify_messages(messages, messages_len)));
+    // ARGS
+    PUTBACK;
+    call_pv("chat::construct_chat", G_SCALAR);
+    SPAGAIN;
 
-        struct chat_view_template tmpl = {
-            .back_link = "/chats",
-            .prefix = config_url_prefix,
-            .avatar = chat.account.avatar,
-            .acct = chat.account.acct,
-            .messages = messages_html
-        };
+    // Duplicate so we can free the TMPs
+    char* dup = savesharedsvpv(POPs);
 
-        chats_page = tmpl_gen_chat_view(&tmpl, len);
-    }
-
-    mastodont_storage_cleanup(&storage);
-    mastodont_storage_cleanup(&acct_storage);
-    free(messages_html);
-    // TODO cleanup messages
-    return chats_page;
-}
-
-void content_chat_view(PATH_ARGS)
-{
-    char* chat_view = construct_chat_view(ssn, api, data[0], NULL);
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    perl_unlock();
 
     struct base_page b = {
         .category = BASE_CAT_CHATS,
-        .content = chat_view,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
     
     // Output
     render_base_page(&b, req, ssn, api);
-    
-    free(chat_view);
-}
 
-
-void content_chat_embed(PATH_ARGS)
-{
-    size_t result_len;
-    char* result;
-    char* chat_view = construct_chat_view(ssn, api, data[0], NULL);
-
-    struct embed_template tmpl = {
-        .stylesheet = "treebird20",
-        .embed = chat_view,
-    };
-
-    result = tmpl_gen_embed(&tmpl, &result_len);
-    
-    // Output
-    send_result(req, NULL, NULL, result, result_len);
-    
-    free(chat_view);
-    free(result);
+    mastodont_storage_cleanup(&storage);
+    mastodont_storage_cleanup(&storage_chat);
+    Safefree(dup);
 }
 
 HV* perlify_chat(const struct mstdnt_chat* chat)
diff --git a/src/conversations.h b/src/conversations.h
index fb988ca..1cabc88 100644
--- a/src/conversations.h
+++ b/src/conversations.h
@@ -45,8 +45,6 @@ char* construct_messages(struct mstdnt_message* message,
                          size_t* ret_size);
 
 void content_chats(PATH_ARGS);
-char* construct_chat_view(struct session* ssn, mastodont_t* api, char* id, size_t* len);
-void content_chat_embed(PATH_ARGS);
 void content_chat_view(PATH_ARGS);
 
 AV* perlify_chats(const struct mstdnt_chat* chats, size_t chats_len);
diff --git a/src/main.c b/src/main.c
index cf05e20..4939f3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -111,7 +111,6 @@ static struct path_info paths[] = {
     { "/tag/:", content_tl_tag },
     { "/chats/:", content_chat_view },
     { "/chats", content_chats },
-    { "/chats_embed/:", content_chat_embed },
     // API
     { "/treebird_api/v1/notifications", api_notifications },
     { "/treebird_api/v1/interact", api_status_interact },

From 56a4146a429960daa8f1d10e56761138ddaf6b8b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 02:27:05 +0000
Subject: [PATCH 088/143] Perlify chats

FossilOrigin-Name: 3386c14b1650d67751762df511b6ed641499890a3992c8e31dbf57ba62efd102
---
 perl/chat.pm        |  5 ++++-
 src/conversations.c | 14 ++++++++++----
 templates/chat.tt   | 39 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/perl/chat.pm b/perl/chat.pm
index 9a3b64b..d4fc2ee 100644
--- a/perl/chat.pm
+++ b/perl/chat.pm
@@ -6,7 +6,7 @@ use Exporter 'import';
 our @EXPORTS = qw( content_chats construct_chat );
 
 use template_helpers 'to_template';
-use string_helpers 'format_username';
+use string_helpers qw( format_username emojify reltime_to_str );
 
 sub construct_chat
 {
@@ -17,6 +17,9 @@ sub construct_chat
         ssn => $ssn,
         chat => $chat,
         messages => $messages,
+        format_username => \&format_username,
+        emojify => \&emojify,
+        reltime => \&reltime_to_str,
         );
 
     to_template(\%vars, \$data->{'chat.tt'});
diff --git a/src/conversations.c b/src/conversations.c
index 76cb81a..3be3e58 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -185,7 +185,9 @@ void content_chats(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_chats(chats, chats_len)));
+    if (chats)
+        XPUSHs(newRV_noinc((SV*)perlify_chats(chats, chats_len)));
+    else ARG_UNDEFINED();
     // ARGS
     PUTBACK;
     call_pv("chat::content_chats", G_SCALAR);
@@ -235,7 +237,7 @@ void content_chat_view(PATH_ARGS)
     };
     
     mastodont_get_chat_messages(api, &m_args, data[0], &args, &storage, &messages, &messages_len);
-    mastodont_get_chat(api, &m_args, data[0],
+    int chat_code = mastodont_get_chat(api, &m_args, data[0],
                        &storage_chat, &chat);
 
     perl_lock();
@@ -246,8 +248,12 @@ void content_chat_view(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
-    XPUSHs(newRV_noinc((SV*)perlify_messages(messages, messages_len)));
+    if (chat_code)
+        XPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
+    else ARG_UNDEFINED();
+    if (messages)
+        XPUSHs(newRV_noinc((SV*)perlify_messages(messages, messages_len)));
+    else ARG_UNDEFINED();
     // ARGS
     PUTBACK;
     call_pv("chat::construct_chat", G_SCALAR);
diff --git a/templates/chat.tt b/templates/chat.tt
index 76cadc9..d9fa3e2 100644
--- a/templates/chat.tt
+++ b/templates/chat.tt
@@ -1 +1,38 @@
-chat
+<div class="page-header">
+    <a href="/chats" class="page-header-button">&larr;</a>
+    <img src="[% chat.account.avatar %]" class="page-header-image avatar">
+    <a href="/@[% chat.account.acct %]" class="page-header-title">[% format_username(chat.account) %]</a>
+</div>
+<div class="chat-view">
+    [% FOREACH msg IN messages %]
+        <div class="message-container[% IF msg.account_id == ssn.account.id %] message-you[% END %]">
+            <img src="
+                      [%- IF msg.account_id == ssn.account.id -%]
+                      [% ssn.account.avatar %]
+                      [%- ELSE -%]
+                      [% chat.account.avatar %]
+                      [%- END -%]
+                      " class="avatar">
+            <div class="message-wrapper">
+                <div class="message" id="[% msg.id %]">
+                    <span class="content">[% emojify(msg.content, msg.emojis) %]</span>
+                    <span class="time">[% reltime(msg.created_at) %]</span>
+                </div>
+            </div>
+        </div>
+    [% END %]
+    <div class="anchor"></div>
+</div>
+<form action="" method="post">
+    <table class="chatbox ui-table">
+        <tr>
+            <td>
+                <textarea></textarea>
+            </td>
+            <td>
+                <input type="submit" class="chatbox-btn btn" value="Send">
+            </td>
+        </tr>
+    </table>
+</form>
+

From 9917ac981e4bd71be8441643d79ba0c69702ace0 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 02:54:33 +0000
Subject: [PATCH 089/143] Reverse chat loop

FossilOrigin-Name: b408ab947f0ee6ceff7ff49d04022c5329fb4fba0f4e92581e41598c8c7e3a82
---
 src/conversations.c | 2 +-
 templates/chat.tt   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/conversations.c b/src/conversations.c
index 3be3e58..cbde683 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -248,7 +248,7 @@ void content_chat_view(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    if (chat_code)
+    if (chat_code == 0)
         XPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
     else ARG_UNDEFINED();
     if (messages)
diff --git a/templates/chat.tt b/templates/chat.tt
index d9fa3e2..ab5e16b 100644
--- a/templates/chat.tt
+++ b/templates/chat.tt
@@ -4,7 +4,10 @@
     <a href="/@[% chat.account.acct %]" class="page-header-title">[% format_username(chat.account) %]</a>
 </div>
 <div class="chat-view">
-    [% FOREACH msg IN messages %]
+    [%# I can't quite say the below is fastest or could be done inline (one eval?),
+       not the fastest but it just works %]
+    [% revmessages = messages.reverse %]
+    [% FOREACH msg IN revmessages %]
         <div class="message-container[% IF msg.account_id == ssn.account.id %] message-you[% END %]">
             <img src="
                       [%- IF msg.account_id == ssn.account.id -%]

From cbeba988907a88f32339a453b3489609635daeb5 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 13:58:26 +0000
Subject: [PATCH 090/143] Add macros for perl stack manipulation

FossilOrigin-Name: b6526e43663896b8e12ffeeec48bdc4ef940fcf73d5c6a8f1a593b9bdb9f9ba8
---
 src/global_perl.h | 18 ++++++++++++++++++
 src/status.c      | 19 ++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/global_perl.h b/src/global_perl.h
index f8eafac..f821af4 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -28,6 +28,24 @@
 #define hvstores_ref(hv, key, val) hv_stores((hv), key,                 \
                                              ((val) ? newRV_inc((SV* const)(val)) : &PL_sv_undef))
 
+/* Seeing all this shit littered in Treebird's code made me decide to write some macros */
+#define PERL_STACK_INIT perl_lock(); \
+    dSP;                             \
+    ENTER;                           \
+    SAVETMPS;                        \
+    PUSHMARK(SP)
+
+#define PERL_STACK_SCALAR_CALL(name) PUTBACK;   \
+    call_pv((name), G_SCALAR);                  \
+    SPAGAIN
+
+/* you MUST assign scalar from savesharedsvpv, then free when done */
+#define PERL_GET_STACK_EXIT savesharedsvpv(POPs);   \
+    PUTBACK;                                        \
+    FREETMPS;                                       \
+    LEAVE;                                          \
+    perl_unlock()
+
 extern PerlInterpreter* my_perl;
 extern HV* template_files;
 extern pthread_mutex_t perllock_mutex;
diff --git a/src/status.c b/src/status.c
index bc2897f..97ba905 100644
--- a/src/status.c
+++ b/src/status.c
@@ -941,11 +941,8 @@ void content_status(PATH_ARGS, uint8_t flags)
                                  &statuses_before, &statuses_after,
                                  &stat_before_len, &stat_after_len);
 
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
+
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
@@ -959,18 +956,10 @@ void content_status(PATH_ARGS, uint8_t flags)
         XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_after, stat_after_len)));
     else
         ARG_UNDEFINED();
-    // ARGS
-    PUTBACK;
-    call_pv("status::content_status", G_SCALAR);
-    SPAGAIN;
 
-    // Duplicate so we can free the TMPs
-    char* dup = savesharedsvpv(POPs);
+    PERL_STACK_SCALAR_CALL("status::content_status");
 
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
         .category = BASE_CAT_NONE,

From b49346e0597c24e20dacbe75a9dc284026bd7173 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 14:58:21 +0000
Subject: [PATCH 091/143] Switch to new macros

FossilOrigin-Name: 9adf01fb2b7c7ee846235df49ccc874e792196a2779034bde1be4043ca9509a7
---
 src/account.c       | 58 +++++++--------------------------------------
 src/base_page.c     | 21 +++++-----------
 src/conversations.c | 38 +++++++----------------------
 src/lists.c         | 19 +++------------
 src/notifications.c | 18 +++-----------
 src/search.c        | 18 +++-----------
 src/timeline.c      | 17 +++----------
 7 files changed, 35 insertions(+), 154 deletions(-)

diff --git a/src/account.c b/src/account.c
index 7ecbc39..9634b20 100644
--- a/src/account.c
+++ b/src/account.c
@@ -82,12 +82,7 @@ static char* accounts_page(HV* session_hv,
 {
     char* output;
 
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-
+    PERL_STACK_INIT;
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (acct)
@@ -105,17 +100,9 @@ static char* accounts_page(HV* session_hv,
     if (header)
         mXPUSHp(header, strlen(header));
 
-    PUTBACK;
-    call_pv("account::content_accounts", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("account::content_accounts");
     
-    output = savesharedsvpv(POPs);
-    
-    // Clean up Perl
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    output = PERL_GET_STACK_EXIT;
 
     mastodont_storage_cleanup(storage);
     mstdnt_cleanup_accounts(accts, accts_len);
@@ -232,12 +219,7 @@ static char* account_statuses_cb(HV* session_hv,
     
     mastodont_get_account_statuses(api, &m_args, acct->id, args, &storage, &statuses, &statuses_len);
 
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-
+    PERL_STACK_INIT;
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
@@ -249,18 +231,10 @@ static char* account_statuses_cb(HV* session_hv,
         XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
     else ARG_UNDEFINED();
 
-    PUTBACK;
-    call_pv("account::content_statuses", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("account::content_statuses");
     
-    result = savesharedsvpv(POPs);
+    result = PERL_GET_STACK_EXIT;
     
-    // Clean up Perl
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
-
     mastodont_storage_cleanup(&storage);
     mstdnt_cleanup_statuses(statuses, statuses_len);
     
@@ -290,13 +264,7 @@ static char* account_scrobbles_cb(HV* session_hv,
     };
     mastodont_get_scrobbles(api, &m_args, acct->id, &args, &storage, &scrobbles, &scrobbles_len);
 
-    // TODO
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-
+    PERL_STACK_INIT;
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
@@ -308,17 +276,9 @@ static char* account_scrobbles_cb(HV* session_hv,
         XPUSHs(newRV_noinc((SV*)perlify_scrobbles(scrobbles, scrobbles_len)));
     else ARG_UNDEFINED();
 
-    PUTBACK;
-    call_pv("account::content_scrobbles", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("account::content_scrobbles");
     
-    result = savesharedsvpv(POPs);
-    
-    // Clean up Perl
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    result = PERL_GET_STACK_EXIT;
 
     mastodont_storage_cleanup(&storage);
     return result;
diff --git a/src/base_page.c b/src/base_page.c
index 5ff8d29..31ca2ff 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -72,12 +72,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
             );
     }
 
-    // Init perl stack
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
+    PERL_STACK_INIT;
 
     if (page->session)
         mXPUSHs(newRV_inc((SV*)page->session));
@@ -94,19 +89,15 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     else XPUSHs(&PL_sv_undef);
     
     // Run function
-    PUTBACK;
-    call_pv("base_page", G_SCALAR);
-    SPAGAIN;
-
-    send_result(req, NULL, "text/html", POPp, 0);
+    PERL_STACK_SCALAR_CALL("base_page");
+    char* dup = PERL_GET_STACK_EXIT;
+    
+    send_result(req, NULL, "text/html", dup, 0);
     
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
     
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
+    Safefree(dup);
 }
 
 void send_result(FCGX_Request* req, char* status, char* content_type, char* data, size_t data_len)
diff --git a/src/conversations.c b/src/conversations.c
index cbde683..f48a561 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -177,29 +177,18 @@ void content_chats(PATH_ARGS)
 
     mastodont_get_chats_v2(api, &m_args, &args, &storage, &chats, &chats_len);
 
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (chats)
         XPUSHs(newRV_noinc((SV*)perlify_chats(chats, chats_len)));
     else ARG_UNDEFINED();
-    // ARGS
-    PUTBACK;
-    call_pv("chat::content_chats", G_SCALAR);
-    SPAGAIN;
+
+    PERL_STACK_SCALAR_CALL("chat::content_chats");
 
     // Duplicate so we can free the TMPs
-    char* dup = savesharedsvpv(POPs);
-
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
 
     struct base_page b = {
         .category = BASE_CAT_CHATS,
@@ -240,11 +229,7 @@ void content_chat_view(PATH_ARGS)
     int chat_code = mastodont_get_chat(api, &m_args, data[0],
                        &storage_chat, &chat);
 
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
@@ -254,18 +239,11 @@ void content_chat_view(PATH_ARGS)
     if (messages)
         XPUSHs(newRV_noinc((SV*)perlify_messages(messages, messages_len)));
     else ARG_UNDEFINED();
-    // ARGS
-    PUTBACK;
-    call_pv("chat::construct_chat", G_SCALAR);
-    SPAGAIN;
+    
+    PERL_STACK_SCALAR_CALL("chat::construct_chat");
 
     // Duplicate so we can free the TMPs
-    char* dup = savesharedsvpv(POPs);
-
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
 
     struct base_page b = {
         .category = BASE_CAT_CHATS,
diff --git a/src/lists.c b/src/lists.c
index e0e5d14..50503f0 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -55,29 +55,16 @@ void content_lists(PATH_ARGS)
 
     mastodont_get_lists(api, &m_args, &storage, &lists, &lists_len);
 
-    // Call perl
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-    
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_lists(lists, lists_len)));
     
-    // ARGS
-    PUTBACK;
-    call_pv("lists::content_lists", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("lists::content_lists");
 
     // Duplicate so we can free the TMPs
-    char* dup = savesharedsvpv(POPs);
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
 
     struct base_page b = {
         .category = BASE_CAT_LISTS,
diff --git a/src/notifications.c b/src/notifications.c
index db85bda..ce843a9 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -216,13 +216,7 @@ void content_notifications(PATH_ARGS)
     if (keystr(ssn->cookies.logged_in))
         mastodont_get_notifications(api, &m_args, &args, &storage, &notifs, &notifs_len);
 
-    // Call perl
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-    
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
@@ -230,16 +224,10 @@ void content_notifications(PATH_ARGS)
         XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     
     // ARGS
-    PUTBACK;
-    call_pv("notifications::content_notifications", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("notifications::content_notifications");
 
     // Duplicate so we can free the TMPs
-    char* dup = savesharedsvpv(POPs);
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
         .category = BASE_CAT_NOTIFICATIONS,
diff --git a/src/search.c b/src/search.c
index 2700790..89a5f2b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -85,28 +85,16 @@ void content_search_all(PATH_ARGS)
 
     mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
 
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
     
-    // ARGS
-    PUTBACK;
-    call_pv("search::content_search", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("search::content_search");
 
     // Duplicate so we can free the TMPs
-    char* dup = savesharedsvpv(POPs);
-
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
 
     struct base_page b = {
         .category = BASE_CAT_NONE,
diff --git a/src/timeline.c b/src/timeline.c
index d326c91..2f57909 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -46,11 +46,7 @@ void content_timeline(FCGX_Request* req,
                       int show_post_box,
                       int fake_timeline)
 {
-    perl_lock();
-    dSP;
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
+    PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
@@ -66,17 +62,10 @@ void content_timeline(FCGX_Request* req,
     mXPUSHi(show_post_box);
     mXPUSHi(fake_timeline);
 
-    PUTBACK;
-    call_pv("timeline::content_timeline", G_SCALAR);
-    SPAGAIN;
+    PERL_STACK_SCALAR_CALL("timeline::content_timeline");
 
     // Duplicate to free temps
-    char* dup = savesharedsvpv(POPs);
-
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-    perl_unlock();
+    char* dup = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
         .category = cat,

From ad8819f482586c57d665ce288c7363b68da7df1b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 21:58:41 +0000
Subject: [PATCH 092/143] Improve sidebar dropdowns, glossy top bar

FossilOrigin-Name: 967b23f6176189dd87ca4b1a8c8f8e90cd5066e81f138ff741cd40dd9233f5a0
---
 dist/treebird.css | 86 ++++++++++++++++++++++++++---------------------
 templates/main.tt | 39 ++++++++++++---------
 2 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 7253f15..f9f0c00 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -106,7 +106,7 @@ table.ui-table td
 #navbar
 {
     border-top: 2px solid #fff;
-    background: linear-gradient(#fbfbfb, #ececef);
+    background: linear-gradient(#fbfbfb 37%, #efefef 50%, #e4e4e9);
     width: 1000px;
     border-bottom: 2px solid #bfbfc4;
     z-index: 999;
@@ -334,41 +334,22 @@ table.ui-table td
     list-style-type: none;
 }
 
+/* .sidebar-submenu .sidebarbtn */
+/* { */
+/*     display: block; */
+/*     color: #000; */
+/*     padding: 8px; */
+/*     border-radius: 4px; */
+/*     padding-left: 24px; */
+/*     text-decoration: none; */
+/*     border: 1px solid transparent; */
+/* } */
 
-.sidebarbtn-sub
-{
-    display: block;
-    color: #000;
-    padding: 8px;
-    border-radius: 4px;
-    padding-left: 24px;
-    text-decoration: none;
-    border: 1px solid transparent;
-}
-
-#leftbar ul.sidebar-config
-{
-    background: linear-gradient(#eef1f9, #bbc3d0);
-    border-radius: 6px;
-    padding: 4px;
-    margin: 8px;
-    border: 1px solid #aaa;
-    box-shadow: inset 0px 2px 3px rgba(0, 0, 0, 0.1);
-}
-
-.sidebarbtn-sub.active
+.sidebar-submenu .sidebarbtn.active
 {
     font-weight: bold;
 }
 
-.sidebarbtn-sub:active, .sidebarbtn-sub:hover
-{
-    background-color: #bbc6d5;
-    text-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2);
-    border: 1px solid #a8accbcc;
-    box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
-}
-
 #rightbar
 {
     border-left: 1px solid #dadada;
@@ -564,8 +545,8 @@ select:hover
 input[type=range] {
     -webkit-appearance: none;
     appearance: none;
-    height: 12px;
-    background: linear-gradient(#f3f3f3, #d5d5d5);
+    height: 4px;
+    background: linear-gradient(#f3f3f3, #c5c5c5);
     border: 1px solid #cacaca;
     border-radius: 4px;
     outline: none;
@@ -579,8 +560,9 @@ input[type=range]::-moz-range-thumb
     appearance: none;
     width: 20px;
     height: 20px;
-    border: 1px solid #303236;
-    background: linear-gradient(#75777c, #505256);
+    border-radius: 50%;
+    border: 1px solid #909090;
+    background: conic-gradient(#ddd, #aaa, #ddd, #aaa, #ddd, #aaa, #ddd);
     cursor: pointer;
 }
 
@@ -598,7 +580,8 @@ input[type=range]::-moz-range-thumb
 .btn:hover,
 .btn:active,
 .btn-menu:hover,
-.sidebarbtn:hover
+.sidebarbtn:hover,
+.sidebar .sidebarbtn:hover
 { 
     background: linear-gradient(#606060, #d3d3d3);
     /* box-shadow: inset 0px -2px 5px rgba(0, 0, 0, 0.2); */
@@ -704,7 +687,8 @@ input[type=submit].post-btn
     padding: 4px 8px;
 }
 
-.sidebarbtn, .sidebarbtn:visited
+.sidebar .sidebarbtn,
+.sidebar .sidebarbtn:visited
 {
     display: block;
     margin: 7px 8px;
@@ -715,11 +699,36 @@ input[type=submit].post-btn
     color: #505050;
 }
 
+
+.sidebar-submenu .sidebarbtn,
+.sidebar-submenu .sidebarbtn:visited
+{
+    color: #202020;
+    margin-left: 0;
+    margin-right: 0;
+    border-radius: 0;
+    padding-left: 24px;
+}
+
+.sidebar-submenu .sidebarbtn:hover
+{
+    background: #abafb4;
+}
+
 .sidebar-login
 {
     padding: 18px;
 }
 
+#leftbar .sidebar-submenu
+{
+    border-left: 4px solid #aa0000;
+    background-color: rgb(214, 219, 225);
+    box-shadow: inset 0px 2px 3px rgba(0, 0, 0, 0.1);
+    padding: 5px 0;
+}
+
+
 /****************************
  *      Notifications       *
  ***************************/
@@ -799,7 +808,8 @@ svg.in-reply-to-icon
     line-height: 23px;
 }
 
-input[type=checkbox].hidden:not(:checked) + .reply-form
+input[type=checkbox].hidden:not(:checked) + .reply-form,
+input[type=checkbox].hidden:not(:checked) + .sidebar-submenu
 {
     display: none;
 }
diff --git a/templates/main.tt b/templates/main.tt
index dd6468a..c6e4405 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -92,25 +92,32 @@
                 <!-- Navigation -->
                 <tr>
                     <td id="leftbar" class="sidebar">
-                        <ul>
-                            <li><a class="sidebarbtn {{ %s : active_home }}" href="$prefix/">[% lang('HOME') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_local }}" href="$prefix/local/">[% lang('LOCAL') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_federated }}" href="$prefix/federated/">[% lang('FEDERATED') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_notifications }}" href="$prefix/notifications">[% lang('NOTIFICATIONS') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_lists }}" href="$prefix/lists">[% lang('LISTS') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_favourites }}" href="$prefix/favourites">[% lang('FAVOURITES') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_bookmarks }}" href="$prefix/bookmarks">[% lang('BOOKMARKS') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_direct }}" href="$prefix/direct">[% lang('DIRECT') %]</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_chats }}" href="$prefix/chats">Chats</a></li>
-                            <li><a class="sidebarbtn {{ %s : active_config }}" href="$prefix/config">[% lang('CONFIG') %]</a></li>
+                        <ul class="sidebar-menu">
+                            <li><a class="sidebarbtn" href="$prefix/">[% lang('HOME') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/local/">[% lang('LOCAL') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/federated/">[% lang('FEDERATED') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/notifications">[% lang('NOTIFICATIONS') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/lists">[% lang('LISTS') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/favourites">[% lang('FAVOURITES') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/bookmarks">[% lang('BOOKMARKS') %]</a></li>
+                            <li><a class="sidebarbtn" href="$prefix/direct">[% lang('DIRECT') %]</a></li>
+                            <li><a class="sidebarbtn sidebarbtn-dropdown" href="$prefix/chats">Chats</a></li>
+                            <li>
+                                <label for="config-dropdown-checkbox">
+                                    <span class="sidebarbtn">
+                                        [% lang('CONFIG') %]
+                                    </span>
+                                </label>
+                                <input type="checkbox" id="config-dropdown-checkbox" class="hidden">
+                                <ul class="sidebar-submenu">
+                                    <li><a class="sidebarbtn" href="/config/general">General</a></li>
+                                    <li><a class="sidebarbtn" href="/config/appearance">Appearance</a></li>
+                                </ul>
+                            </li>
                         </ul>
                         
-                        <ul class="sidebar-config">
-                            <li><a class="sidebarbtn-sub" href="$prefix/config/general">[% lang('GENERAL') %]</a></li>
-                            <li><a class="sidebarbtn-sub" href="$prefix/config/appearance">[% lang('APPEARANCE') %]</a></li>
-                        </ul>
 
-                        
+
                         <!-- <div class="static-html" id="instance-panel"></div> -->
                         <div class="mini-links">
                             <a href="$prefix/about">About</a>

From dfd49db8d383f06830eb8877659ef8d8f3e91112 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 22:31:34 +0000
Subject: [PATCH 093/143] Config page boilerplate

FossilOrigin-Name: bc30f815e30d2776fd26c2147963e4358c73f9efc09b64ff527459fc5e5f9319
---
 dist/treebird.css              |  2 +-
 perl/config.pm                 | 20 ++++++++
 perl/main.pl                   |  1 +
 src/global_perl.c              |  4 ++
 src/page_config.c              | 69 ++++++++++---------------
 src/page_config.h              |  2 +-
 templates/config_appearance.tt | 42 +++++++++++++++
 templates/config_general.tt    | 94 ++++++++++++++++++++++++++++++++++
 8 files changed, 189 insertions(+), 45 deletions(-)
 create mode 100644 perl/config.pm
 create mode 100644 templates/config_appearance.tt
 create mode 100644 templates/config_general.tt

diff --git a/dist/treebird.css b/dist/treebird.css
index f9f0c00..8dccbce 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -106,7 +106,7 @@ table.ui-table td
 #navbar
 {
     border-top: 2px solid #fff;
-    background: linear-gradient(#fbfbfb 37%, #efefef 50%, #e4e4e9);
+    background: linear-gradient(#fbfbfb 40%, #efefef 50%, #e4e4e9);
     width: 1000px;
     border-bottom: 2px solid #bfbfc4;
     z-index: 999;
diff --git a/perl/config.pm b/perl/config.pm
new file mode 100644
index 0000000..2cc6462
--- /dev/null
+++ b/perl/config.pm
@@ -0,0 +1,20 @@
+package config;
+use strict;
+use warnings;
+
+our @EXPORT = qw( general appearance );
+use Exporter 'import';
+
+use template_helpers 'to_template';
+
+sub general
+{
+    
+}
+
+sub appearance
+{
+    
+}
+
+1;
diff --git a/perl/main.pl b/perl/main.pl
index 2805691..9ec7c40 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -12,6 +12,7 @@ use account;
 use lists;
 use search;
 use chat;
+use config;
 
 # my $template = Template->new(
 #     {
diff --git a/src/global_perl.c b/src/global_perl.c
index 5556418..c47d269 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -42,6 +42,8 @@
 #include "../templates/search_tags.ctt"
 #include "../templates/content_chats.ctt"
 #include "../templates/chat.ctt"
+#include "../templates/config_general.ctt"
+#include "../templates/config_appearance.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -74,6 +76,8 @@ void init_template_files(pTHX)
     hv_stores(template_files, "search_tags.tt", newSVpv(data_search_tags_tt, data_search_tags_tt_size));
     hv_stores(template_files, "content_chats.tt", newSVpv(data_content_chats_tt, data_content_chats_tt_size));
     hv_stores(template_files, "chat.tt", newSVpv(data_chat_tt, data_chat_tt_size));
+    hv_stores(template_files, "config_general.tt", newSVpv(data_config_general_tt, data_config_general_tt_size));
+    hv_stores(template_files, "config_appearance.tt", newSVpv(data_config_appearance_tt, data_config_appearance_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/page_config.c b/src/page_config.c
index 1e3eb72..f7022c0 100644
--- a/src/page_config.c
+++ b/src/page_config.c
@@ -17,6 +17,7 @@
  */
 
 #include "page_config.h"
+#include "global_perl.h"
 #include <stdlib.h>
 #include <string.h>
 #include "http.h"
@@ -44,69 +45,51 @@ enum config_category
     CONFIG_CAT_ACCOUNT
 };
 
-static char* construct_config_sidebar(enum config_category cat, size_t* size)
-{
-    struct config_sidebar_template tdata = {
-        .prefix = config_url_prefix,
-        .general_active = CAT_TEXT(cat, CONFIG_CAT_GENERAL),
-        .general = L10N[L10N_EN_US][L10N_GENERAL],
-        .appearance_active = CAT_TEXT(cat, CONFIG_CAT_APPEARANCE),
-        .appearance = L10N[L10N_EN_US][L10N_APPEARANCE],
-        .account_active = CAT_TEXT(cat, CONFIG_CAT_ACCOUNT),
-        .account = L10N[L10N_EN_US][L10N_ACCOUNT],
-    };
-    
-    return tmpl_gen_config_sidebar(&tdata, size);
-}
-
 void content_config_general(PATH_ARGS)
 {
-    char* sidebar_html = construct_config_sidebar(CONFIG_CAT_GENERAL, NULL);
-
-    struct config_general_template tdata = {
-        .js_on = bool_checked(js),
-        .jsactions_on = bool_checked(jsactions),
-        .jsreply_on = bool_checked(jsreply),
-        .jslive_on = bool_checked(jslive),
-        .status_attachments_on = bool_checked(stat_attachments),
-        .status_greentexts_on = bool_checked(stat_greentexts),
-        .status_dopameme_on = bool_checked(stat_dope),
-        .status_oneclicksoftware_on = bool_checked(stat_oneclicksoftware),
-        .status_emojo_likes_on = bool_checked(stat_emojo_likes),
-        .status_hide_muted_on = bool_checked(stat_hide_muted),
-        .instance_show_shoutbox_on = bool_checked(instance_show_shoutbox),
-        .instance_panel_on = bool_checked(instance_panel),
-        .notifications_embed_on = bool_checked(notif_embed)
-    };
-
-    char* general_page = tmpl_gen_config_general(&tdata, NULL);
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    
+    PERL_STACK_SCALAR_CALL("config::general");
+    
+    char* dup = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
         .category = BASE_CAT_CONFIG,
-        .content = general_page,
-        .sidebar_left = sidebar_html
+        .content = dup,
+        .session = session_hv,
+        .sidebar_left = NULL
     };
 
     render_base_page(&b, req, ssn, api);
     // Cleanup
-    free(sidebar_html);
-    free(general_page);
+    Safefree(dup);
 }
 
 
 void content_config_appearance(PATH_ARGS)
 {
-    char* sidebar_html = construct_config_sidebar(CONFIG_CAT_APPEARANCE, NULL);
-
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    
+    PERL_STACK_SCALAR_CALL("config::appearance");
+    
+    char* dup = PERL_GET_STACK_EXIT;
+    
     struct base_page b = {
         .category = BASE_CAT_CONFIG,
-        .content = data_config_appearance,
-        .sidebar_left = sidebar_html
+        .content = dup,
+        .session = session_hv,
+        .sidebar_left = NULL
     };
 
     render_base_page(&b, req, ssn, api);
     // Cleanup
-    free(sidebar_html);
+    Safefree(dup);
 }
 
 void content_config(PATH_ARGS)
diff --git a/src/page_config.h b/src/page_config.h
index e2baa4f..e4f15d3 100644
--- a/src/page_config.h
+++ b/src/page_config.h
@@ -27,7 +27,7 @@
 
 void content_config_appearance(PATH_ARGS);
 void content_config_general(PATH_ARGS);
-void content_config_account(PATH_ARGS);
+//void content_config_account(PATH_ARGS);
 void content_config(PATH_ARGS);
 
 #endif // PAGE_CONFIG_H
diff --git a/templates/config_appearance.tt b/templates/config_appearance.tt
new file mode 100644
index 0000000..764f3ef
--- /dev/null
+++ b/templates/config_appearance.tt
@@ -0,0 +1,42 @@
+<div class="simple-page">
+  <form action="appearance" method="post" enctype="multipart/form-data">
+    <!-- Lets server know we sent it -->
+    <input type="hidden" name="set" value="1">
+    <h1>Appearance</h1>
+    <input class="btn btn-single" type="submit" value="Save">
+    <h3>Theme variant</h3>
+    <ul>
+      <li>
+        <label for="cfgthemevar">Theme variant</label>
+        <select name="theme" id="cfgthemevar">
+          <option value="treebird" title="Created by nekobit (@neko@rdrama.cc) | Former dark variant created by Grumbulon (@grumbulon@freecumextremist.com)">Treebird - Default, simple theme</option>
+          <option value="solarized" title="Created by coyote (@coyote@pl.lain.sh)">Solarized - Solarized colors for pleasant viewing</option>
+        </select>
+      </li>
+    </ul>
+    <h3>Color Scheme</h3>
+    <ul>
+      <li>
+        <input type="radio" id="cfglight" name="themeclr" value="0" checked>
+        <label for="cfglight">Light</label>
+      </li>
+      <li>
+        <input type="radio" id="cfgdark" name="themeclr" value="1">
+        <label for="cfgdark">Dark</label>
+      </li>
+    </ul>
+    <h3>Background</h3>
+    <ul>
+      <li>
+        <input type="file" name="file">
+      </li>
+    </ul>
+    <ul>
+      <li>
+        Sidebar opacity: <input type="range" name="sidebaropacity" min="0" max="255" value="255">
+      </li>
+    </ul>
+    
+    <input class="btn btn-single" type="submit" value="Save">
+  </form>
+</div>
diff --git a/templates/config_general.tt b/templates/config_general.tt
new file mode 100644
index 0000000..50c8ffb
--- /dev/null
+++ b/templates/config_general.tt
@@ -0,0 +1,94 @@
+<div class="simple-page">
+  <form action="general" method="post">
+    <!-- Lets server know we sent it -->
+    <input type="hidden" name="set" value="1">
+
+    <h1>General</h1>
+    <input class="btn btn-single" type="submit" value="Save">
+    <h3>Locales</h3>
+    <ul>
+      <li>
+        <label for="cfglang">Language:</label>
+        <select name="lang" id="cfglang">
+          <option value="0">English</option>
+          <option value="1">Spanish</option>
+          <option value="2">Chinese (Traditional)</option>
+        </select>
+      </li>
+    </ul>
+
+    <h3>JavaScript</h3>
+    <ul>
+      <li>
+        <input type="checkbox" id="cfgjs" name="js" value="1" {{%s:js_on}}>
+        <label for="cfgjs">Enable JavaScript - If disabled, overrides options below</label>
+      </li>
+      <!-- <li> -->
+      <!--   <input type="checkbox" id="cfgjsactions" name="jsactions" value="1" {{%s:jsactions_on}}> -->
+      <!--   <label for="cfgjsactions">Quick actions - Likes, Boosts, etc done in background</label> -->
+      <!-- </li> -->
+      <!-- <li> -->
+      <!--   <input type="checkbox" id="cfgjsreply" name="jsreply" value="1" {{%s:jsreply_on}}> -->
+      <!--   <label for="cfgjsreply">Quick reply - Replies don't require redirects</label> -->
+      <!-- </li> -->
+      <!-- <li> -->
+      <!--   <input type="checkbox" id="cfgjslive" name="jslive" value="1" {{%s:jslive_on}}> -->
+      <!--   <label for="cfgjslive">Live update - Statuses, chats, and reactions fetch on the fly</label> -->
+      <!-- </li> -->
+    </ul>
+
+    <h3>Statuses</h3>
+    <ul>
+      <li>
+        <input type="checkbox" id="cfgstatattachments" name="statattachments" value="1" {{%s:status_attachments_on}}>
+        <label for="cfgstatattachments">Show attachments - If disabled, attachments are links instead</label>
+      </li>
+      <li>
+        <input type="checkbox" id="cfgstatgreentexts" name="statgreentexts" value="1" {{%s:status_greentexts_on}}>
+        <label for="cfgstatgreentexts">Show greentexts</label>
+      </li>
+      <li>
+        <input type="checkbox" id="cfgstatdope" name="statdope" value="1" {{%s:status_dopameme_on}}>
+        <label for="cfgstatdope">Show dopameme numbers - Likes, comments, and boost counts</label>
+      </li>
+      <li>
+        <input type="checkbox" id="cfgstatoneclicksoftware" name="statoneclicksoftware" value="1" {{%s:status_oneclicksoftware_on}}>
+        <label for="cfgstatoneclicksoftware">Show Like-Boost button - Show a button in the status which likes and boosts a post</label>
+      </li>
+      <li>
+        <input type="checkbox" id="interactimg" name="interact_img" value="1" {{%s:status_interact_img_on}}>
+        <label for="interactimg">Use IMG for interaction buttons - Compatibility</label>
+      </li>
+      <!-- <li> -->
+      <!--   <input type="checkbox" id="cfgstatemojolikes" name="statemojolikes" value="1" {{%s:status_emojo_likes_on}}> -->
+      <!--   <label for="cfgstatemojolikes">Convert Emoji reacts to likes - Also disables the emoji reaction button</label> -->
+      <!-- </li> -->
+      <!-- <li> -->
+      <!--   <input type="checkbox" id="cfgstathidemuted" name="stathidemuted" value="1" {{%s:status_hide_muted_on}}> -->
+      <!--   <label for="cfgstathidemuted">Hide statuses from muted users and threads - If disabled, statuses will appear collapsed</label> -->
+      <!-- </li> -->
+    </ul>
+
+    <h3>Instance</h3>
+    <ul>
+      <!-- <li> -->
+      <!--   <input type="checkbox" id="cfginstanceshowshoutbox" name="instanceshowshoutbox" value="1" {{%s:instance_show_shoutbox_on}}> -->
+      <!--   <label for="cfginstanceshowshoutbox">Show instance shoutbox (JS required)</label> -->
+      <!-- </li> -->
+      <li>
+        <input type="checkbox" id="cfginstancepanel" name="instancepanel" value="1" {{%s:instance_panel_on}}>
+        <label for="cfginstancepanel">Show instance panel - <em>Admins should <strong>not</strong> use the instance panel for major announcements</em></label>
+      </li>
+    </ul>
+
+    <h3>Notifications</h3>
+    <ul>
+      <li>
+        <input type="checkbox" id="cfgnotifembed" name="notifembed" value="1" {{%s:notifications_embed_on}}>
+        <label for="cfgnotifembed">Display notifications in iFrame - iFrames separate loading from the main page</label>
+      </li>
+    </ul>
+
+    <input class="btn btn-single" type="submit" value="Save">
+  </form>
+</div>

From 5f32afa0cda564f0fbccc6d29de538f11ad87946 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 18 Aug 2022 22:34:11 +0000
Subject: [PATCH 094/143] Config page

All that is left is we carry current config values

FossilOrigin-Name: d91f87afec897d986b251b80428e97355244c4307d440f8aea9c29803f171755
---
 perl/config.pm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/perl/config.pm b/perl/config.pm
index 2cc6462..6144af4 100644
--- a/perl/config.pm
+++ b/perl/config.pm
@@ -9,12 +9,26 @@ use template_helpers 'to_template';
 
 sub general
 {
-    
+    my ($ssn, $data) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        );
+
+    to_template(\%vars, \$data->{'config_general.tt'});
 }
 
 sub appearance
 {
-    
+    my ($ssn, $data) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        );
+
+    to_template(\%vars, \$data->{'config_appearance.tt'});    
 }
 
 1;

From c9eaaac234fa380dd7bd77797a0c47538e9278fd Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 03:52:26 +0000
Subject: [PATCH 095/143] Notifications embed

FossilOrigin-Name: 9ceac560758f39950f7edeaa79580d7cd0b212108a197efd7f57b24413c42dac
---
 perl/embed.pm                  |  25 +++++
 perl/main.pl                   |   1 +
 perl/notifications.pm          |  20 +++-
 src/global_perl.c              |   4 +
 src/local_config.c             |   1 -
 src/local_config.h             |   1 -
 src/local_config_set.c         |   1 -
 src/main.c                     |   1 -
 src/notifications.c            |  59 +++--------
 templates/config_appearance.tt |  71 ++++++--------
 templates/config_general.tt    | 172 ++++++++++++++++-----------------
 templates/embed.tt             |  29 ++++++
 templates/main.tt              |   4 +-
 templates/notifs_embed.tt      |  12 +++
 14 files changed, 220 insertions(+), 181 deletions(-)
 create mode 100644 perl/embed.pm
 create mode 100644 templates/embed.tt
 create mode 100644 templates/notifs_embed.tt

diff --git a/perl/embed.pm b/perl/embed.pm
new file mode 100644
index 0000000..6cc6d32
--- /dev/null
+++ b/perl/embed.pm
@@ -0,0 +1,25 @@
+package embed;
+use strict;
+use warnings;
+use Exporter 'import';
+
+our @EXPORT = qw( generate_embedded_page );
+
+use template_helpers 'to_template';
+
+sub generate_embedded_page
+{
+    my ($ssn, $data, $content) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        content => $content,
+        );
+    
+    to_template(\%vars, \$data->{'embed.tt'});
+
+}
+
+1;
+
diff --git a/perl/main.pl b/perl/main.pl
index 9ec7c40..6476873 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -13,6 +13,7 @@ use lists;
 use search;
 use chat;
 use config;
+use embed;
 
 # my $template = Template->new(
 #     {
diff --git a/perl/notifications.pm b/perl/notifications.pm
index 90e80f9..b2bb974 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -3,12 +3,13 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( generate_notification content_notifications );
+our @EXPORT = qw( generate_notification content_notifications embed_notifications );
 
 use template_helpers 'to_template';
 use status 'generate_status';
 use string_helpers qw( random_error_kaomoji );
 use icons 'get_icon';
+use embed 'generate_embedded_page';
 
 sub generate_notification
 {
@@ -43,4 +44,19 @@ sub content_notifications
     to_template(\%vars, \$data->{'content_notifs.tt'});
 }
 
-return 1;
+sub embed_notifications
+{
+    my ($ssn, $data, $notifs) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        notifs => $notifs,
+        notification => sub { generate_notification($ssn, $data, shift, 1); },
+        random_error_kaomoji => \&random_error_kaomoji,
+        );
+    
+    generate_embedded_page($ssn, $data, to_template(\%vars, \$data->{'notifs_embed.tt'}));
+}
+
+1;
diff --git a/src/global_perl.c b/src/global_perl.c
index c47d269..7171b40 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -44,6 +44,8 @@
 #include "../templates/chat.ctt"
 #include "../templates/config_general.ctt"
 #include "../templates/config_appearance.ctt"
+#include "../templates/embed.ctt"
+#include "../templates/notifs_embed.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -78,6 +80,8 @@ void init_template_files(pTHX)
     hv_stores(template_files, "chat.tt", newSVpv(data_chat_tt, data_chat_tt_size));
     hv_stores(template_files, "config_general.tt", newSVpv(data_config_general_tt, data_config_general_tt_size));
     hv_stores(template_files, "config_appearance.tt", newSVpv(data_config_appearance_tt, data_config_appearance_tt_size));
+    hv_stores(template_files, "embed.tt", newSVpv(data_embed_tt, data_embed_tt_size));
+    hv_stores(template_files, "notifs_embed.tt", newSVpv(data_notifs_embed_tt, data_notifs_embed_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/local_config.c b/src/local_config.c
index 2bfc3a5..d7784d3 100644
--- a/src/local_config.c
+++ b/src/local_config.c
@@ -27,7 +27,6 @@ HV* perlify_config(struct local_config* config)
     hv_stores(ssn_config_hv, "theme", newSVpv(config->theme, 0));
     hv_stores(ssn_config_hv, "background_url", newSVpv(config->background_url, 0));
     hv_stores(ssn_config_hv, "lang", newSViv(config->lang));
-    hv_stores(ssn_config_hv, "themeclr", newSViv(config->themeclr));
     hv_stores(ssn_config_hv, "jsactions", newSViv(config->jsactions));
     hv_stores(ssn_config_hv, "jslive", newSViv(config->jslive));
     hv_stores(ssn_config_hv, "js", newSViv(config->js));
diff --git a/src/local_config.h b/src/local_config.h
index e1b0578..94b3333 100644
--- a/src/local_config.h
+++ b/src/local_config.h
@@ -27,7 +27,6 @@ struct local_config
     char* theme;
     char* background_url;
     int lang;
-    int themeclr;
     int jsactions;
     int jsreply;
     int jslive;
diff --git a/src/local_config_set.c b/src/local_config_set.c
index d34b889..b5eda48 100644
--- a/src/local_config_set.c
+++ b/src/local_config_set.c
@@ -93,7 +93,6 @@ struct mstdnt_storage* load_config(FCGX_Request* req,
     set_config_str(req, ssn, &(ssn->config.background_url), "background_url", &(atm), &(ssn->cookies.background_url), page, CONFIG_APPEARANCE);
     set_config_int(LOAD_CFG_SIM("sidebaropacity",       sidebar_opacity), CONFIG_APPEARANCE);
     set_config_str(LOAD_CFG_SIM("theme",                theme), CONFIG_APPEARANCE);
-    set_config_int(LOAD_CFG_SIM("themeclr",             themeclr), CONFIG_APPEARANCE);
     set_config_int(LOAD_CFG_SIM("jsactions",            jsactions), CONFIG_GENERAL);
     set_config_int(LOAD_CFG_SIM("jsreply",              jsreply), CONFIG_GENERAL);
     set_config_int(LOAD_CFG_SIM("jslive",               jslive), CONFIG_GENERAL);
diff --git a/src/main.c b/src/main.c
index 4939f3a..1124eae 100644
--- a/src/main.c
+++ b/src/main.c
@@ -123,7 +123,6 @@ static void application(mastodont_t* api, FCGX_Request* req)
     struct session ssn = {
         .config = {
             .theme = "treebird20",
-            .themeclr = 0,
             .lang = L10N_EN_US,
             .jsactions = 1,
             .jsreply = 1,
diff --git a/src/notifications.c b/src/notifications.c
index ce843a9..3c4418c 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -244,15 +244,12 @@ void content_notifications(PATH_ARGS)
 
 void content_notifications_compact(PATH_ARGS)
 {
-    char* theme_str = NULL;
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    char* page, *notif_html = NULL;
+    char* page;
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_notification* notifs = NULL;
     size_t notifs_len = 0;
-    char* start_id = NULL;
-    char* navigation_box = NULL;
 
     if (keystr(ssn->cookies.logged_in))
     {
@@ -269,56 +266,24 @@ void content_notifications_compact(PATH_ARGS)
             .limit = 20,
         };
 
-        if (mastodont_get_notifications(api,
-                                        &m_args,
-                                        &args,
-                                        &storage,
-                                        &notifs,
-                                        &notifs_len) == 0)
-        {
-            if (notifs && notifs_len)
-            {
-                notif_html = construct_notifications_compact(ssn, api, notifs, notifs_len, NULL);
-                start_id = keystr(ssn->post.start_id) ? keystr(ssn->post.start_id) : notifs[0].id;
-                navigation_box = construct_navigation_box(start_id,
-                                                          notifs[0].id,
-                                                          notifs[notifs_len-1].id,
-                                                          NULL);
-                mstdnt_cleanup_notifications(notifs, notifs_len);
-            }
-            else
-                notif_html = construct_error("No notifications", E_NOTICE, 1, NULL);
-        }   
-        else
-            notif_html = construct_error(storage.error, E_ERROR, 1, NULL);
-
+        mastodont_get_notifications(api, &m_args, &args, &storage, &notifs, &notifs_len);
     }
 
-    // Set theme
-    if (ssn->config.theme && !(strcmp(ssn->config.theme, "treebird") == 0 &&
-          ssn->config.themeclr == 0))
-    {
-        easprintf(&theme_str, "<link rel=\"stylesheet\" type=\"text/css\" href=\"/%s%s.css\">",
-                  ssn->config.theme,
-                  ssn->config.themeclr ? "-dark" : "");
-    }
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    if (notifs)
+        XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     
-    size_t len;
-    struct notifications_embed_template tdata = {
-        .theme_str = theme_str,
-        .notifications = notif_html,
-        .navigation_box = navigation_box
-    };
+    PERL_STACK_SCALAR_CALL("notifications::embed_notifications");
 
-    page = tmpl_gen_notifications_embed(&tdata, &len);
+    page = PERL_GET_STACK_EXIT;
 
-    send_result(req, NULL, NULL, page, len);
+    send_result(req, NULL, NULL, page, 0);
 
     mastodont_storage_cleanup(&storage);
-    free(notif_html);
-    free(navigation_box);
-    free(page);
-    free(theme_str);
+    mstdnt_cleanup_notifications(notifs, notifs_len);
 }
 
 void content_notifications_clear(PATH_ARGS)
diff --git a/templates/config_appearance.tt b/templates/config_appearance.tt
index 764f3ef..bf1a664 100644
--- a/templates/config_appearance.tt
+++ b/templates/config_appearance.tt
@@ -1,42 +1,33 @@
 <div class="simple-page">
-  <form action="appearance" method="post" enctype="multipart/form-data">
-    <!-- Lets server know we sent it -->
-    <input type="hidden" name="set" value="1">
-    <h1>Appearance</h1>
-    <input class="btn btn-single" type="submit" value="Save">
-    <h3>Theme variant</h3>
-    <ul>
-      <li>
-        <label for="cfgthemevar">Theme variant</label>
-        <select name="theme" id="cfgthemevar">
-          <option value="treebird" title="Created by nekobit (@neko@rdrama.cc) | Former dark variant created by Grumbulon (@grumbulon@freecumextremist.com)">Treebird - Default, simple theme</option>
-          <option value="solarized" title="Created by coyote (@coyote@pl.lain.sh)">Solarized - Solarized colors for pleasant viewing</option>
-        </select>
-      </li>
-    </ul>
-    <h3>Color Scheme</h3>
-    <ul>
-      <li>
-        <input type="radio" id="cfglight" name="themeclr" value="0" checked>
-        <label for="cfglight">Light</label>
-      </li>
-      <li>
-        <input type="radio" id="cfgdark" name="themeclr" value="1">
-        <label for="cfgdark">Dark</label>
-      </li>
-    </ul>
-    <h3>Background</h3>
-    <ul>
-      <li>
-        <input type="file" name="file">
-      </li>
-    </ul>
-    <ul>
-      <li>
-        Sidebar opacity: <input type="range" name="sidebaropacity" min="0" max="255" value="255">
-      </li>
-    </ul>
-    
-    <input class="btn btn-single" type="submit" value="Save">
-  </form>
+    <form action="appearance" method="post" enctype="multipart/form-data">
+        <!-- Lets server know we sent it -->
+        <input type="hidden" name="set" value="1">
+        <h1>Appearance</h1>
+        <input class="btn btn-single" type="submit" value="Save">
+        <h3>Theme variant</h3>
+        <ul>
+            <li>
+                <label for="cfgthemevar">Theme variant</label>
+                <select name="theme" id="cfgthemevar">
+                    <option value="treebird" title="Created by nekobit (@neko@rdrama.cc)">Treebird - Default, simple theme</option>
+                    <option value="treebird-dark" title="Created by nekobit (@neko@rdrama.cc) | Former dark variant created by Grumbulon (@grumbulon@freecumextremist.com)">Treebird Dark - Dark variant</option>
+                    <option value="solarized" title="Created by coyote (@coyote@pl.lain.sh)">Solarized - Solarized colors for pleasant viewing</option>
+                    <option value="solarized-dark" title="Created by coyote (@coyote@pl.lain.sh)">Solarized Dark - Solarized dark variant</option>
+                </select>
+            </li>
+        </ul>
+        <h3>Background</h3>
+        <ul>
+            <li>
+                <input type="file" name="file">
+            </li>
+        </ul>
+        <ul>
+            <li>
+                Sidebar opacity: <input type="range" name="sidebaropacity" min="0" max="255" value="255">
+            </li>
+        </ul>
+        
+        <input class="btn btn-single" type="submit" value="Save">
+    </form>
 </div>
diff --git a/templates/config_general.tt b/templates/config_general.tt
index 50c8ffb..c8bf934 100644
--- a/templates/config_general.tt
+++ b/templates/config_general.tt
@@ -1,94 +1,94 @@
 <div class="simple-page">
-  <form action="general" method="post">
-    <!-- Lets server know we sent it -->
-    <input type="hidden" name="set" value="1">
+    <form action="general" method="post">
+        <!-- Lets server know we sent it -->
+        <input type="hidden" name="set" value="1">
 
-    <h1>General</h1>
-    <input class="btn btn-single" type="submit" value="Save">
-    <h3>Locales</h3>
-    <ul>
-      <li>
-        <label for="cfglang">Language:</label>
-        <select name="lang" id="cfglang">
-          <option value="0">English</option>
-          <option value="1">Spanish</option>
-          <option value="2">Chinese (Traditional)</option>
-        </select>
-      </li>
-    </ul>
+        <h1>General</h1>
+        <input class="btn btn-single" type="submit" value="Save">
+        <h3>Locales</h3>
+        <ul>
+            <li>
+                <label for="cfglang">Language:</label>
+                <select name="lang" id="cfglang">
+                    <option value="0">English</option>
+                    <option value="1">Spanish</option>
+                    <option value="2">Chinese (Traditional)</option>
+                </select>
+            </li>
+        </ul>
 
-    <h3>JavaScript</h3>
-    <ul>
-      <li>
-        <input type="checkbox" id="cfgjs" name="js" value="1" {{%s:js_on}}>
-        <label for="cfgjs">Enable JavaScript - If disabled, overrides options below</label>
-      </li>
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgjsactions" name="jsactions" value="1" {{%s:jsactions_on}}> -->
-      <!--   <label for="cfgjsactions">Quick actions - Likes, Boosts, etc done in background</label> -->
-      <!-- </li> -->
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgjsreply" name="jsreply" value="1" {{%s:jsreply_on}}> -->
-      <!--   <label for="cfgjsreply">Quick reply - Replies don't require redirects</label> -->
-      <!-- </li> -->
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgjslive" name="jslive" value="1" {{%s:jslive_on}}> -->
-      <!--   <label for="cfgjslive">Live update - Statuses, chats, and reactions fetch on the fly</label> -->
-      <!-- </li> -->
-    </ul>
+        <h3>JavaScript</h3>
+        <ul>
+            <li>
+                <input type="checkbox" id="cfgjs" name="js" value="1"[% IF ssn.config.js %] checked[% END %]>
+                <label for="cfgjs">Enable JavaScript - If disabled, overrides options below</label>
+            </li>
+            <!-- <li> -->
+            <!--   <input type="checkbox" id="cfgjsactions" name="jsactions" value="1" {{%s:jsactions_on}}> -->
+            <!--   <label for="cfgjsactions">Quick actions - Likes, Boosts, etc done in background</label> -->
+            <!-- </li> -->
+            <!-- <li> -->
+            <!--   <input type="checkbox" id="cfgjsreply" name="jsreply" value="1" {{%s:jsreply_on}}> -->
+            <!--   <label for="cfgjsreply">Quick reply - Replies don't require redirects</label> -->
+            <!-- </li> -->
+            <!-- <li> -->
+            <!--   <input type="checkbox" id="cfgjslive" name="jslive" value="1" {{%s:jslive_on}}> -->
+            <!--   <label for="cfgjslive">Live update - Statuses, chats, and reactions fetch on the fly</label> -->
+            <!-- </li> -->
+        </ul>
 
-    <h3>Statuses</h3>
-    <ul>
-      <li>
-        <input type="checkbox" id="cfgstatattachments" name="statattachments" value="1" {{%s:status_attachments_on}}>
-        <label for="cfgstatattachments">Show attachments - If disabled, attachments are links instead</label>
-      </li>
-      <li>
-        <input type="checkbox" id="cfgstatgreentexts" name="statgreentexts" value="1" {{%s:status_greentexts_on}}>
-        <label for="cfgstatgreentexts">Show greentexts</label>
-      </li>
-      <li>
-        <input type="checkbox" id="cfgstatdope" name="statdope" value="1" {{%s:status_dopameme_on}}>
-        <label for="cfgstatdope">Show dopameme numbers - Likes, comments, and boost counts</label>
-      </li>
-      <li>
-        <input type="checkbox" id="cfgstatoneclicksoftware" name="statoneclicksoftware" value="1" {{%s:status_oneclicksoftware_on}}>
-        <label for="cfgstatoneclicksoftware">Show Like-Boost button - Show a button in the status which likes and boosts a post</label>
-      </li>
-      <li>
-        <input type="checkbox" id="interactimg" name="interact_img" value="1" {{%s:status_interact_img_on}}>
-        <label for="interactimg">Use IMG for interaction buttons - Compatibility</label>
-      </li>
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgstatemojolikes" name="statemojolikes" value="1" {{%s:status_emojo_likes_on}}> -->
-      <!--   <label for="cfgstatemojolikes">Convert Emoji reacts to likes - Also disables the emoji reaction button</label> -->
-      <!-- </li> -->
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgstathidemuted" name="stathidemuted" value="1" {{%s:status_hide_muted_on}}> -->
-      <!--   <label for="cfgstathidemuted">Hide statuses from muted users and threads - If disabled, statuses will appear collapsed</label> -->
-      <!-- </li> -->
-    </ul>
+        <h3>Statuses</h3>
+        <ul>
+            <li>
+                <input type="checkbox" id="cfgstatattachments" name="statattachments" value="1" [% IF ssn.config.stat_attachments %] checked[% END %]>
+                <label for="cfgstatattachments">Show attachments - If disabled, attachments are links instead</label>
+            </li>
+            <li>
+                <input type="checkbox" id="cfgstatgreentexts" name="statgreentexts" value="1" [% IF ssn.config.stat_greentexts %] checked[% END %]>
+                <label for="cfgstatgreentexts">Show greentexts</label>
+            </li>
+            <li>
+                <input type="checkbox" id="cfgstatdope" name="statdope" value="1" [% IF ssn.config.stat_dope %] checked[% END %]>
+                <label for="cfgstatdope">Show dopameme numbers - Likes, comments, and boost counts</label>
+            </li>
+            <li>
+                <input type="checkbox" id="cfgstatoneclicksoftware" name="statoneclicksoftware" value="1" [% IF ssn.config.stat_oneclicksoftware %] checked[% END %]>
+                <label for="cfgstatoneclicksoftware">Show Like-Boost button - Show a button in the status which likes and boosts a post</label>
+            </li>
+            <li>
+                <input type="checkbox" id="interactimg" name="interact_img" value="1" [% IF ssn.config.interact_img %] checked[% END %]>
+                <label for="interactimg">Use IMG for interaction buttons - Compatibility</label>
+            </li>
+            <!-- <li> -->
+            <!--   <input type="checkbox" id="cfgstatemojolikes" name="statemojolikes" value="1" {{%s:status_emojo_likes_on}}> -->
+            <!--   <label for="cfgstatemojolikes">Convert Emoji reacts to likes - Also disables the emoji reaction button</label> -->
+            <!-- </li> -->
+            <!-- <li> -->
+            <!--   <input type="checkbox" id="cfgstathidemuted" name="stathidemuted" value="1" {{%s:status_hide_muted_on}}> -->
+            <!--   <label for="cfgstathidemuted">Hide statuses from muted users and threads - If disabled, statuses will appear collapsed</label> -->
+            <!-- </li> -->
+        </ul>
 
-    <h3>Instance</h3>
-    <ul>
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfginstanceshowshoutbox" name="instanceshowshoutbox" value="1" {{%s:instance_show_shoutbox_on}}> -->
-      <!--   <label for="cfginstanceshowshoutbox">Show instance shoutbox (JS required)</label> -->
-      <!-- </li> -->
-      <li>
-        <input type="checkbox" id="cfginstancepanel" name="instancepanel" value="1" {{%s:instance_panel_on}}>
-        <label for="cfginstancepanel">Show instance panel - <em>Admins should <strong>not</strong> use the instance panel for major announcements</em></label>
-      </li>
-    </ul>
+        <h3>Instance</h3>
+        <ul>
+            <!-- <li> -->
+            <!--   <input type="checkbox" id="cfginstanceshowshoutbox" name="instanceshowshoutbox" value="1" {{%s:instance_show_shoutbox_on}}> -->
+            <!--   <label for="cfginstanceshowshoutbox">Show instance shoutbox (JS required)</label> -->
+            <!-- </li> -->
+            <li>
+                <input type="checkbox" id="cfginstancepanel" name="instancepanel" value="1" [% IF ssn.config.instance_panel %] checked[% END %]>
+                <label for="cfginstancepanel">Show instance panel - <em>Admins should <strong>not</strong> use the instance panel for major announcements</em></label>
+            </li>
+        </ul>
 
-    <h3>Notifications</h3>
-    <ul>
-      <li>
-        <input type="checkbox" id="cfgnotifembed" name="notifembed" value="1" {{%s:notifications_embed_on}}>
-        <label for="cfgnotifembed">Display notifications in iFrame - iFrames separate loading from the main page</label>
-      </li>
-    </ul>
+        <h3>Notifications</h3>
+        <ul>
+            <li>
+                <input type="checkbox" id="cfgnotifembed" name="notifembed" value="1" [% IF ssn.config.notif_embed %] checked[% END %]>
+                <label for="cfgnotifembed">Display notifications in iFrame - iFrames separate loading from the main page</label>
+            </li>
+        </ul>
 
-    <input class="btn btn-single" type="submit" value="Save">
-  </form>
+        <input class="btn btn-single" type="submit" value="Save">
+    </form>
 </div>
diff --git a/templates/embed.tt b/templates/embed.tt
new file mode 100644
index 0000000..470b8cc
--- /dev/null
+++ b/templates/embed.tt
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Embed</title>
+        <meta charset="utf-8">
+        <link rel="stylesheet" type="text/css" href="/treebird.css">
+        [% UNLESS ssn.config.theme == "treebird" %]
+            <link
+                rel="stylesheet"
+                type="text/css"
+                href="/[% ssn.config.theme %].css">
+        [% END %]
+
+        <style>
+         /* Overrides */
+         html, body
+         {
+             margin: 0;
+             padding: 0;
+             background-color: unset;
+         }
+        </style>
+    </head>
+    <body>
+        <div class="embed">
+            [% content %]
+        </div>
+    </body>
+</html>
diff --git a/templates/main.tt b/templates/main.tt
index c6e4405..47d1ef2 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -5,11 +5,11 @@
         <title>$title</title>
         <link rel="icon" type="image/png" href="/favicon.png">
         <link rel="stylesheet" type="text/css" href="/treebird.css">
-        [% IF !(ssn.config.theme == "treebird" && ssn.config.themeclr == 0) %]
+        [% UNLESS ssn.config.theme == "treebird" %]
             <link
                 rel="stylesheet"
                 type="text/css"
-                href="/[% ssn.config.theme %][% IF ssn.config.themeclr %]-dark[% END %].css">
+                href="/[% ssn.config.theme %].css">
         [% END %]
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="{{ %s : title }} is a decentralized social media platform">
diff --git a/templates/notifs_embed.tt b/templates/notifs_embed.tt
new file mode 100644
index 0000000..dc0271f
--- /dev/null
+++ b/templates/notifs_embed.tt
@@ -0,0 +1,12 @@
+<div class="notifications-compact">
+    [% IF notifs %]
+        [% FOREACH notif IN notifs %]
+            [% notification(notif, 1) %]
+        [% END %]
+    [% ELSE %]
+        <div class="fancy-error">
+            <span class="fancy-error-text">No notifications.</span>
+        </div>
+    [% END %]
+</div>
+

From 2609e9680c3a5ac2e09fc25ca18e0ae43a80cf98 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 04:46:41 +0000
Subject: [PATCH 096/143] Bring back embedded notifications

FossilOrigin-Name: 8eb2f577e9a9de679829d1694231f527dfacf53938ecc52f323021ed52744bfd
---
 dist/treebird.css         |  67 ++++++++++++++++-------
 perl/notifications.pm     |   3 +-
 templates/embed.tt        |   2 +-
 templates/main.tt         |  15 +++---
 templates/notification.tt |   2 +-
 templates/notifs_embed.tt |   1 +
 templates/status.tt       | 110 +++++++++++++++++++-------------------
 7 files changed, 119 insertions(+), 81 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 8dccbce..9672f70 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -1,3 +1,10 @@
+/*
+ * Notes:
+ * - Good luck :^3
+ * - Look into position: sticky; to handle overflows? Not sure if this works but i saw it work i think
+ */
+
+
 /* Variables */
 :root
 {
@@ -37,6 +44,13 @@ form
     display: inline;
 }
 
+html.embed
+{
+    background-color: unset;
+    scrollbar-color: #808080 #eaecf0;
+    scrollbar-width: thin;
+}
+
 /* Basic elements */
 h1, h2, h3, h4
 {
@@ -224,7 +238,7 @@ table.ui-table td
 }
 
 
-.sidebar-embed-container .navigation
+.embed .navigation
 {
     position: sticky;
     top: 0px;
@@ -234,20 +248,20 @@ table.ui-table td
     padding: 0;
 }
 
-.sidebar-embed-container .btn,
-.sidebar-embed-container .nav-btn
+.embed .btn,
+.embed .nav-btn
 {
     background: unset;
     padding: 2px !important;
     font-size: 13px;
 }
 
-.sidebar-embed-container .btn-disabled
+.embed .btn-disabled
 {
     background: unset;
 }
 
-.sidebar-embed-container .btn:hover
+.embed .btn:hover
 {
     background: unset;
     background-color: rgba(0, 0, 0, 0.2);
@@ -334,17 +348,6 @@ table.ui-table td
     list-style-type: none;
 }
 
-/* .sidebar-submenu .sidebarbtn */
-/* { */
-/*     display: block; */
-/*     color: #000; */
-/*     padding: 8px; */
-/*     border-radius: 4px; */
-/*     padding-left: 24px; */
-/*     text-decoration: none; */
-/*     border: 1px solid transparent; */
-/* } */
-
 .sidebar-submenu .sidebarbtn.active
 {
     font-weight: bold;
@@ -971,6 +974,14 @@ input[type=checkbox].hidden:not(:checked) + .sidebar-submenu
     display: none;
 }
 
+.status-hide:checked + .status.status-compact .action-icon
+{
+    position: initial;
+    float: left;
+    left: initial;
+    top: initial;
+}
+
 .pfp-td
 {
     position: relative;
@@ -1122,17 +1133,24 @@ input[type=checkbox].hidden:not(:checked) + .sidebar-submenu
     font-size: 14px;
 }
 
-.status-compact.status.status-notification
+.status-compact.status.status-notification,
+.notifications-compact .notification.notification-regular
 {
     padding: 5px;
 }
 
-.status-compact .pfp-td img
+.status-compact .pfp-td img,
+.notifications-compact .notification.notification-regular .pfp-td img
 {
     width: 28px;
     height: 28px;
 }
 
+.notifications-compact .notification.notification-regular .pfp-td
+{
+    width: 28px;
+}
+
 .status-compact .action-icon
 {
     position: absolute;
@@ -1194,6 +1212,19 @@ input[type=checkbox].hidden:not(:checked) + .sidebar-submenu
     top: -2px;
 }
 
+.status-compact .attachments img,
+.status-compact .attachments video
+{
+    display: inline;
+    margin-right: 6px;
+    width: 70px;
+    height: 40px;
+    background-color: #fff;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+    object-fit: cover;
+}
+
 .status-compact .status-buttons
 {
     float: initial;
diff --git a/perl/notifications.pm b/perl/notifications.pm
index b2bb974..2acde3d 100644
--- a/perl/notifications.pm
+++ b/perl/notifications.pm
@@ -10,6 +10,7 @@ use status 'generate_status';
 use string_helpers qw( random_error_kaomoji );
 use icons 'get_icon';
 use embed 'generate_embedded_page';
+use navigation 'generate_navigation';
 
 sub generate_notification
 {
@@ -53,7 +54,7 @@ sub embed_notifications
         ssn => $ssn,
         notifs => $notifs,
         notification => sub { generate_notification($ssn, $data, shift, 1); },
-        random_error_kaomoji => \&random_error_kaomoji,
+        nav => sub { generate_navigation($ssn, $data, $notifs->[0]->{id}, $notifs->[-1]->{id}) },
         );
     
     generate_embedded_page($ssn, $data, to_template(\%vars, \$data->{'notifs_embed.tt'}));
diff --git a/templates/embed.tt b/templates/embed.tt
index 470b8cc..bb5fb18 100644
--- a/templates/embed.tt
+++ b/templates/embed.tt
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="embed">
     <head>
         <title>Embed</title>
         <meta charset="utf-8">
diff --git a/templates/main.tt b/templates/main.tt
index 47d1ef2..966a0bb 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -176,12 +176,15 @@
                             </div>
 
                             <!-- Notifications -->
-                            <div class="notifications-compact">
-                                [% FOREACH notif IN notifs %]
-                                    [% notification(ssn, data, notif, 1) %]
-                                [% END %]
-                            </div>
-                            
+                            [% IF ssn.config.notif_embed %]
+                                <iframe class="sidebar-frame" loading="lazy" src="/notifications_compact"></iframe>
+                            [% ELSE %]
+                                <div class="notifications-compact">
+                                    [% FOREACH notif IN notifs %]
+                                        [% notification(ssn, data, notif, 1) %]
+                                    [% END %]
+                                </div>
+                            [% END %]
                         [% ELSE %]
                             <div class="sidebar-login">
                                 <form action="$prefix/login" method="post">
diff --git a/templates/notification.tt b/templates/notification.tt
index f8e30d9..6877161 100644
--- a/templates/notification.tt
+++ b/templates/notification.tt
@@ -25,7 +25,7 @@
                     [% icon('follow') %]
                 </div>
                 <div class="notification-content">
-                    <a href="/@[% notif.account.acct %]">@[% notif.account.acct %]</a>
+                    <a href="/@[% notif.account.acct %]" target="_parent">@[% notif.account.acct %]</a>
                 </div>
             </td>
         </tr>
diff --git a/templates/notifs_embed.tt b/templates/notifs_embed.tt
index dc0271f..9c58960 100644
--- a/templates/notifs_embed.tt
+++ b/templates/notifs_embed.tt
@@ -1,3 +1,4 @@
+[% nav() %]
 <div class="notifications-compact">
     [% IF notifs %]
         [% FOREACH notif IN notifs %]
diff --git a/templates/status.tt b/templates/status.tt
index 05958f5..63289cb 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -46,61 +46,58 @@
                         <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     [% END %]
                     <span class="alignend">
-                            
-                            <div class="menu-container status-visibility">
-                                [% UNLESS notif && compact && interacted_with %]
-                                    [% vis_to_icon(status.visibility) %]
-                                [% ELSE %]
-                                    <span class="time">[% rel_to_str(notif.created_at) %]</span>
+                        <div class="menu-container status-visibility">
+                            [% UNLESS notif && compact && interacted_with %]
+                                [% vis_to_icon(status.visibility) %]
+                            [% ELSE %]
+                                <span class="time">[% rel_to_str(notif.created_at) %]</span>
+                            [% END %]
+                            <div class="menu">
+                                [% IF notif %]
+                                    <ul>
+                                        <li>
+                                            <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
+                                        </li>
+                                        <li>
+                                            <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
+                                        </li>
+                                    </ul>
                                 [% END %]
-                                <div class="menu">
-                                    [% IF notif %]
-                                        <ul>
-                                            <li>
-                                                <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
-                                            </li>
-                                            <li>
-                                                <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
-                                            </li>
-                                        </ul>
-                                    [% END %]
-                                    [% UNLESS notif && compact && interacted_with %]
-                                        <ul>
-                                            <li>
-                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                    <input type="hidden" name="itype" value="mute">
-                                                    <input type="submit" class="btn-menu" value="Mute">
-                                                </form>
-                                            </li>
-                                            <li>
-                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                    <input type="hidden" name="itype" value="bookmark">
-                                                    <input type="submit" class="btn-menu" value="Bookmark">
-                                                </form>
-                                            </li>
-                                            [%# pin %]
-                                            <li>
-                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                    <input type="hidden" name="itype" value="pin">
-                                                    <input type="submit" class="btn-menu" value="Pin">
-                                                </form>
-                                            </li>
-                                            [%# Delete %]
-                                            <li>
-                                                <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                                    <input type="hidden" name="itype" value="delete">
-                                                    <input type="submit" class="btn-menu" value="Delete status">
-                                                </form>
-                                            </li>
+                                [% UNLESS notif && compact && interacted_with %]
+                                    <ul>
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="mute">
+                                                <input type="submit" class="btn-menu" value="Mute">
+                                            </form>
+                                        </li>
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="bookmark">
+                                                <input type="submit" class="btn-menu" value="Bookmark">
+                                            </form>
+                                        </li>
+                                        [%# pin %]
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="pin">
+                                                <input type="submit" class="btn-menu" value="Pin">
+                                            </form>
+                                        </li>
+                                        [%# Delete %]
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="delete">
+                                                <input type="submit" class="btn-menu" value="Delete status">
+                                            </form>
+                                        </li>
 
-                                        </ul>
-                                    [% END %]
-                                </div>
+                                    </ul>
+                                [% END %]
                             </div>
-                           
-                        [% UNLESS compact %]
-                            <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
-                        [% END %]
+                        </div>
+                        
+                        <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
                     </span>
                 </div>
                 <div class="status-data">
@@ -118,15 +115,20 @@
                     </span>
                     [% IF status.media_attachments %]
                         <div class="attachments">
-                            [% FOR att IN status.media_attachments %]
+                            [% i = 0 %]
+                            [% FOREACH att IN status.media_attachments %]
+                                [%# Set a limit if compact %]
+                                [% LAST IF i >= 6 && compact %]
+                                    
                                 [% make_att(ssn, data, att, status.sensitive) %]
+                                [% i = i + 1 %]
                             [% END %]
                         </div>
                     [% END %]
                     [%# TODO {{%s:interactions}} %]
                     [% IF status.pleroma.emoji_reactions %]
                         <div class="emoji-reactions">
-                        [% FOR emo IN status.pleroma.emoji_reactions %]
+                        [% FOREACH emo IN status.pleroma.emoji_reactions %]
                             [% make_emoji(ssn, data, status.id, emo) %]
                         [% END %]
                         </div>

From c33d7174f177284cbc7f1e5ba0338680032e1580 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 14:53:24 +0000
Subject: [PATCH 097/143] Remove navbar top border

On HiDPI displays it had a little gap, maybe due to the gradient since it's glossy now?

FossilOrigin-Name: 244b80a33e291d985a8f707a5b6aa2c9a3bc06364c16016ebb3a363f9744952a
---
 dist/treebird.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 9672f70..55c13d4 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -119,7 +119,6 @@ table.ui-table td
 
 #navbar
 {
-    border-top: 2px solid #fff;
     background: linear-gradient(#fbfbfb 40%, #efefef 50%, #e4e4e9);
     width: 1000px;
     border-bottom: 2px solid #bfbfc4;
@@ -157,7 +156,7 @@ table.ui-table td
 {
     vertical-align: middle;
     display: inline-block;
-    margin: 4px 0px 6px 18px;
+    margin: 6px 0px 6px 18px;
 }
 
 #navbar span.info

From 6f90b245a4a3340761db7dea96fe319beaa069fa Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 14:55:03 +0000
Subject: [PATCH 098/143] Fix list crash

\n\nNeeds error handling

FossilOrigin-Name: 5a4fe5967a5ccd65e3811aa5d75f3dd75e8a48ed30a90922ae3a2c82a773028f
---
 src/lists.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lists.c b/src/lists.c
index 50503f0..ce24f34 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -59,7 +59,8 @@ void content_lists(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_lists(lists, lists_len)));
+    if (lists)
+        XPUSHs(newRV_noinc((SV*)perlify_lists(lists, lists_len)));
     
     PERL_STACK_SCALAR_CALL("lists::content_lists");
 

From 670a4021b8a5478bff871e4a392dbd8fa85e2322 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 15:06:19 +0000
Subject: [PATCH 099/143] Perlify meta pages

FossilOrigin-Name: d2af76ca88f30b880bf7d22f8247dc17b370dfa83700adef18798e33b3e85a37
---
 perl/config.pm              |  20 +-
 perl/main.pl                |   1 +
 perl/meta.pm                |  21 ++
 perl/template_helpers.pm    |  16 +-
 src/about.c                 |  35 +-
 src/global_perl.c           |   4 +
 static/license.tmpl         | 680 ------------------------------------
 templates/about.tt          |  28 ++
 templates/config_general.tt |   6 +-
 templates/license.tt        | 680 ++++++++++++++++++++++++++++++++++++
 10 files changed, 778 insertions(+), 713 deletions(-)
 create mode 100644 perl/meta.pm
 create mode 100644 templates/about.tt
 create mode 100644 templates/license.tt

diff --git a/perl/config.pm b/perl/config.pm
index 6144af4..9fa32e0 100644
--- a/perl/config.pm
+++ b/perl/config.pm
@@ -5,30 +5,16 @@ use warnings;
 our @EXPORT = qw( general appearance );
 use Exporter 'import';
 
-use template_helpers 'to_template';
+use template_helpers 'simple_page';
 
 sub general
 {
-    my ($ssn, $data) = @_;
-
-    my %vars = (
-        prefix => '',
-        ssn => $ssn,
-        );
-
-    to_template(\%vars, \$data->{'config_general.tt'});
+    simple_page @_, 'config_general.tt';
 }
 
 sub appearance
 {
-    my ($ssn, $data) = @_;
-
-    my %vars = (
-        prefix => '',
-        ssn => $ssn,
-        );
-
-    to_template(\%vars, \$data->{'config_appearance.tt'});    
+    simple_page @_, 'config_appearance.tt';
 }
 
 1;
diff --git a/perl/main.pl b/perl/main.pl
index 6476873..dc9ba54 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -14,6 +14,7 @@ use search;
 use chat;
 use config;
 use embed;
+use meta;
 
 # my $template = Template->new(
 #     {
diff --git a/perl/meta.pm b/perl/meta.pm
new file mode 100644
index 0000000..5db57fd
--- /dev/null
+++ b/perl/meta.pm
@@ -0,0 +1,21 @@
+package meta;
+use strict;
+use warnings;
+
+our @EXPORT = qw(  );
+
+use Exporter 'import';
+
+use template_helpers 'simple_page';
+
+sub about
+{
+    simple_page @_, 'about.tt';
+}
+
+sub license
+{
+    simple_page @_, 'license.tt';
+}
+
+1;
diff --git a/perl/template_helpers.pm b/perl/template_helpers.pm
index 748acc9..023800f 100644
--- a/perl/template_helpers.pm
+++ b/perl/template_helpers.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw( &to_template );
+our @EXPORT = qw( to_template simple_page );
 
 use string_helpers 'simple_escape';
 
@@ -39,3 +39,17 @@ sub to_template
 
     $result;
 }
+
+# Generic simple page with only session data and pages.
+# Pretty commonly done, so useful function.
+sub simple_page
+{
+    my ($ssn, $data, $page) = @_;
+    
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        );
+
+    to_template(\%vars, \$data->{$page});
+}
diff --git a/src/about.c b/src/about.c
index 2937a6e..a59c458 100644
--- a/src/about.c
+++ b/src/about.c
@@ -25,35 +25,46 @@
 
 void content_about(PATH_ARGS)
 {
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+
+    PERL_STACK_SCALAR_CALL("meta::about");
+
+    char* dup = PERL_GET_STACK_EXIT;
+    
     struct base_page b = {
         .category = BASE_CAT_NONE,
-        .content = (char*)data_about,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
-    // Output
     render_base_page(&b, req, ssn, api);
+    Safefree(dup);
 }
 
 
 void content_about_license(PATH_ARGS)
 {
-    char* page;
-    char* referer = GET_ENV("HTTP_REFERER", req);
-    struct license_template tdata = {
-        .back_ref = referer,
-        .license_str = "License"
-    };
-    page = tmpl_gen_license(&tdata, NULL);
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+
+    PERL_STACK_SCALAR_CALL("meta::license");
+
+    char* dup = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
         .category = BASE_CAT_NONE,
-        .content = page,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
-    // Output
     render_base_page(&b, req, ssn, api);
-    free(page);
+    Safefree(dup);
 }
 
diff --git a/src/global_perl.c b/src/global_perl.c
index 7171b40..f142515 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -46,6 +46,8 @@
 #include "../templates/config_appearance.ctt"
 #include "../templates/embed.ctt"
 #include "../templates/notifs_embed.ctt"
+#include "../templates/about.ctt"
+#include "../templates/license.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -82,6 +84,8 @@ void init_template_files(pTHX)
     hv_stores(template_files, "config_appearance.tt", newSVpv(data_config_appearance_tt, data_config_appearance_tt_size));
     hv_stores(template_files, "embed.tt", newSVpv(data_embed_tt, data_embed_tt_size));
     hv_stores(template_files, "notifs_embed.tt", newSVpv(data_notifs_embed_tt, data_notifs_embed_tt_size));
+    hv_stores(template_files, "about.tt", newSVpv(data_about_tt, data_about_tt_size));
+    hv_stores(template_files, "license.tt", newSVpv(data_license_tt, data_license_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/static/license.tmpl b/static/license.tmpl
index 27986e8..e69de29 100644
--- a/static/license.tmpl
+++ b/static/license.tmpl
@@ -1,680 +0,0 @@
-<div class="simple-page">
-    <h1><a href="{{ %s : back_ref }}" class="page-back-btn">&lt;</a> {{ %s : license_str }}</h1>
-  <h3 style="text-align: center;">GNU AFFERO GENERAL PUBLIC LICENSE</h3>
-  <p style="text-align: center;">Version 3, 19 November 2007</p>
-
-  <p>Copyright &copy; 2007 Free Software Foundation,
-    Inc. &lt;<a href="https://fsf.org/">https://fsf.org/</a>&gt;
-    <br />
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.</p>
-
-  <h4 id="preamble">Preamble</h4>
-
-  <p>The GNU Affero General Public License is a free, copyleft license
-    for software and other kinds of works, specifically designed to ensure
-    cooperation with the community in the case of network server software.</p>
-
-  <p>The licenses for most software and other practical works are
-    designed to take away your freedom to share and change the works.  By
-    contrast, our General Public Licenses are intended to guarantee your
-    freedom to share and change all versions of a program--to make sure it
-    remains free software for all its users.</p>
-
-  <p>When we speak of free software, we are referring to freedom, not
-    price.  Our General Public Licenses are designed to make sure that you
-    have the freedom to distribute copies of free software (and charge for
-    them if you wish), that you receive source code or can get it if you
-    want it, that you can change the software or use pieces of it in new
-    free programs, and that you know you can do these things.</p>
-
-  <p>Developers that use our General Public Licenses protect your rights
-    with two steps: (1) assert copyright on the software, and (2) offer
-    you this License which gives you legal permission to copy, distribute
-    and/or modify the software.</p>
-
-  <p>A secondary benefit of defending all users' freedom is that
-    improvements made in alternate versions of the program, if they
-    receive widespread use, become available for other developers to
-    incorporate.  Many developers of free software are heartened and
-    encouraged by the resulting cooperation.  However, in the case of
-    software used on network servers, this result may fail to come about.
-    The GNU General Public License permits making a modified version and
-    letting the public access it on a server without ever releasing its
-    source code to the public.</p>
-
-  <p>The GNU Affero General Public License is designed specifically to
-    ensure that, in such cases, the modified source code becomes available
-    to the community.  It requires the operator of a network server to
-    provide the source code of the modified version running there to the
-    users of that server.  Therefore, public use of a modified version, on
-    a publicly accessible server, gives the public access to the source
-    code of the modified version.</p>
-
-  <p>An older license, called the Affero General Public License and
-    published by Affero, was designed to accomplish similar goals.  This is
-    a different license, not a version of the Affero GPL, but Affero has
-    released a new version of the Affero GPL which permits relicensing under
-    this license.</p>
-
-  <p>The precise terms and conditions for copying, distribution and
-    modification follow.</p>
-
-  <h4 id="terms">TERMS AND CONDITIONS</h4>
-
-  <h4 id="section0">0. Definitions.</h4>
-
-  <p>&quot;This License&quot; refers to version 3 of the GNU Affero General Public
-    License.</p>
-
-  <p>&quot;Copyright&quot; also means copyright-like laws that apply to other kinds
-    of works, such as semiconductor masks.</p>
-
-  <p>&quot;The Program&quot; refers to any copyrightable work licensed under this
-    License.  Each licensee is addressed as &quot;you&quot;.  &quot;Licensees&quot; and
-    &quot;recipients&quot; may be individuals or organizations.</p>
-
-  <p>To &quot;modify&quot; a work means to copy from or adapt all or part of the work
-    in a fashion requiring copyright permission, other than the making of an
-    exact copy.  The resulting work is called a &quot;modified version&quot; of the
-    earlier work or a work &quot;based on&quot; the earlier work.</p>
-
-  <p>A &quot;covered work&quot; means either the unmodified Program or a work based
-    on the Program.</p>
-
-  <p>To &quot;propagate&quot; a work means to do anything with it that, without
-    permission, would make you directly or secondarily liable for
-    infringement under applicable copyright law, except executing it on a
-    computer or modifying a private copy.  Propagation includes copying,
-    distribution (with or without modification), making available to the
-    public, and in some countries other activities as well.</p>
-
-  <p>To &quot;convey&quot; a work means any kind of propagation that enables other
-    parties to make or receive copies.  Mere interaction with a user through
-    a computer network, with no transfer of a copy, is not conveying.</p>
-
-  <p>An interactive user interface displays &quot;Appropriate Legal Notices&quot;
-    to the extent that it includes a convenient and prominently visible
-    feature that (1) displays an appropriate copyright notice, and (2)
-    tells the user that there is no warranty for the work (except to the
-    extent that warranties are provided), that licensees may convey the
-    work under this License, and how to view a copy of this License.  If
-    the interface presents a list of user commands or options, such as a
-    menu, a prominent item in the list meets this criterion.</p>
-
-  <h4 id="section1">1. Source Code.</h4>
-
-  <p>The &quot;source code&quot; for a work means the preferred form of the work
-    for making modifications to it.  &quot;Object code&quot; means any non-source
-    form of a work.</p>
-
-  <p>A &quot;Standard Interface&quot; means an interface that either is an official
-    standard defined by a recognized standards body, or, in the case of
-    interfaces specified for a particular programming language, one that
-    is widely used among developers working in that language.</p>
-
-  <p>The &quot;System Libraries&quot; of an executable work include anything, other
-    than the work as a whole, that (a) is included in the normal form of
-    packaging a Major Component, but which is not part of that Major
-    Component, and (b) serves only to enable use of the work with that
-    Major Component, or to implement a Standard Interface for which an
-    implementation is available to the public in source code form.  A
-    &quot;Major Component&quot;, in this context, means a major essential component
-    (kernel, window system, and so on) of the specific operating system
-    (if any) on which the executable work runs, or a compiler used to
-    produce the work, or an object code interpreter used to run it.</p>
-
-  <p>The &quot;Corresponding Source&quot; for a work in object code form means all
-    the source code needed to generate, install, and (for an executable
-    work) run the object code and to modify the work, including scripts to
-    control those activities.  However, it does not include the work's
-    System Libraries, or general-purpose tools or generally available free
-    programs which are used unmodified in performing those activities but
-    which are not part of the work.  For example, Corresponding Source
-    includes interface definition files associated with source files for
-    the work, and the source code for shared libraries and dynamically
-    linked subprograms that the work is specifically designed to require,
-    such as by intimate data communication or control flow between those
-    subprograms and other parts of the work.</p>
-
-  <p>The Corresponding Source need not include anything that users
-    can regenerate automatically from other parts of the Corresponding
-    Source.</p>
-
-  <p>The Corresponding Source for a work in source code form is that
-    same work.</p>
-
-  <h4 id="section2">2. Basic Permissions.</h4>
-
-  <p>All rights granted under this License are granted for the term of
-    copyright on the Program, and are irrevocable provided the stated
-    conditions are met.  This License explicitly affirms your unlimited
-    permission to run the unmodified Program.  The output from running a
-    covered work is covered by this License only if the output, given its
-    content, constitutes a covered work.  This License acknowledges your
-    rights of fair use or other equivalent, as provided by copyright law.</p>
-
-  <p>You may make, run and propagate covered works that you do not
-    convey, without conditions so long as your license otherwise remains
-    in force.  You may convey covered works to others for the sole purpose
-    of having them make modifications exclusively for you, or provide you
-    with facilities for running those works, provided that you comply with
-    the terms of this License in conveying all material for which you do
-    not control copyright.  Those thus making or running the covered works
-    for you must do so exclusively on your behalf, under your direction
-    and control, on terms that prohibit them from making any copies of
-    your copyrighted material outside their relationship with you.</p>
-
-  <p>Conveying under any other circumstances is permitted solely under
-    the conditions stated below.  Sublicensing is not allowed; section 10
-    makes it unnecessary.</p>
-
-  <h4 id="section3">3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
-
-  <p>No covered work shall be deemed part of an effective technological
-    measure under any applicable law fulfilling obligations under article
-    11 of the WIPO copyright treaty adopted on 20 December 1996, or
-    similar laws prohibiting or restricting circumvention of such
-    measures.</p>
-
-  <p>When you convey a covered work, you waive any legal power to forbid
-    circumvention of technological measures to the extent such circumvention
-    is effected by exercising rights under this License with respect to
-    the covered work, and you disclaim any intention to limit operation or
-    modification of the work as a means of enforcing, against the work's
-    users, your or third parties' legal rights to forbid circumvention of
-    technological measures.</p>
-
-  <h4 id="section4">4. Conveying Verbatim Copies.</h4>
-
-  <p>You may convey verbatim copies of the Program's source code as you
-    receive it, in any medium, provided that you conspicuously and
-    appropriately publish on each copy an appropriate copyright notice;
-    keep intact all notices stating that this License and any
-    non-permissive terms added in accord with section 7 apply to the code;
-    keep intact all notices of the absence of any warranty; and give all
-    recipients a copy of this License along with the Program.</p>
-
-  <p>You may charge any price or no price for each copy that you convey,
-    and you may offer support or warranty protection for a fee.</p>
-
-  <h4 id="section5">5. Conveying Modified Source Versions.</h4>
-
-  <p>You may convey a work based on the Program, or the modifications to
-    produce it from the Program, in the form of source code under the
-    terms of section 4, provided that you also meet all of these conditions:</p>
-
-  <ul>
-
-    <li>a) The work must carry prominent notices stating that you modified
-      it, and giving a relevant date.</li>
-
-    <li>b) The work must carry prominent notices stating that it is
-      released under this License and any conditions added under section
-      7.  This requirement modifies the requirement in section 4 to
-      &quot;keep intact all notices&quot;.</li>
-
-    <li>c) You must license the entire work, as a whole, under this
-      License to anyone who comes into possession of a copy.  This
-      License will therefore apply, along with any applicable section 7
-      additional terms, to the whole of the work, and all its parts,
-      regardless of how they are packaged.  This License gives no
-      permission to license the work in any other way, but it does not
-      invalidate such permission if you have separately received it.</li>
-
-    <li>d) If the work has interactive user interfaces, each must display
-      Appropriate Legal Notices; however, if the Program has interactive
-      interfaces that do not display Appropriate Legal Notices, your
-      work need not make them do so.</li>
-
-  </ul>
-
-  <p>A compilation of a covered work with other separate and independent
-    works, which are not by their nature extensions of the covered work,
-    and which are not combined with it such as to form a larger program,
-    in or on a volume of a storage or distribution medium, is called an
-    &quot;aggregate&quot; if the compilation and its resulting copyright are not
-    used to limit the access or legal rights of the compilation's users
-    beyond what the individual works permit.  Inclusion of a covered work
-    in an aggregate does not cause this License to apply to the other
-    parts of the aggregate.</p>
-
-  <h4 id="section6">6. Conveying Non-Source Forms.</h4>
-
-  <p>You may convey a covered work in object code form under the terms
-    of sections 4 and 5, provided that you also convey the
-    machine-readable Corresponding Source under the terms of this License,
-    in one of these ways:</p>
-
-  <ul>
-
-    <li>a) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by the
-      Corresponding Source fixed on a durable physical medium
-      customarily used for software interchange.</li>
-
-    <li>b) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by a
-      written offer, valid for at least three years and valid for as
-      long as you offer spare parts or customer support for that product
-      model, to give anyone who possesses the object code either (1) a
-      copy of the Corresponding Source for all the software in the
-      product that is covered by this License, on a durable physical
-      medium customarily used for software interchange, for a price no
-      more than your reasonable cost of physically performing this
-      conveying of source, or (2) access to copy the
-      Corresponding Source from a network server at no charge.</li>
-
-    <li>c) Convey individual copies of the object code with a copy of the
-      written offer to provide the Corresponding Source.  This
-      alternative is allowed only occasionally and noncommercially, and
-      only if you received the object code with such an offer, in accord
-      with subsection 6b.</li>
-
-    <li>d) Convey the object code by offering access from a designated
-      place (gratis or for a charge), and offer equivalent access to the
-      Corresponding Source in the same way through the same place at no
-      further charge.  You need not require recipients to copy the
-      Corresponding Source along with the object code.  If the place to
-      copy the object code is a network server, the Corresponding Source
-      may be on a different server (operated by you or a third party)
-      that supports equivalent copying facilities, provided you maintain
-      clear directions next to the object code saying where to find the
-      Corresponding Source.  Regardless of what server hosts the
-      Corresponding Source, you remain obligated to ensure that it is
-      available for as long as needed to satisfy these requirements.</li>
-
-    <li>e) Convey the object code using peer-to-peer transmission, provided
-      you inform other peers where the object code and Corresponding
-      Source of the work are being offered to the general public at no
-      charge under subsection 6d.</li>
-
-  </ul>
-
-  <p>A separable portion of the object code, whose source code is excluded
-    from the Corresponding Source as a System Library, need not be
-    included in conveying the object code work.</p>
-
-  <p>A &quot;User Product&quot; is either (1) a &quot;consumer product&quot;, which means any
-    tangible personal property which is normally used for personal, family,
-    or household purposes, or (2) anything designed or sold for incorporation
-    into a dwelling.  In determining whether a product is a consumer product,
-    doubtful cases shall be resolved in favor of coverage.  For a particular
-    product received by a particular user, &quot;normally used&quot; refers to a
-    typical or common use of that class of product, regardless of the status
-    of the particular user or of the way in which the particular user
-    actually uses, or expects or is expected to use, the product.  A product
-    is a consumer product regardless of whether the product has substantial
-    commercial, industrial or non-consumer uses, unless such uses represent
-    the only significant mode of use of the product.</p>
-
-  <p>&quot;Installation Information&quot; for a User Product means any methods,
-    procedures, authorization keys, or other information required to install
-    and execute modified versions of a covered work in that User Product from
-    a modified version of its Corresponding Source.  The information must
-    suffice to ensure that the continued functioning of the modified object
-    code is in no case prevented or interfered with solely because
-    modification has been made.</p>
-
-  <p>If you convey an object code work under this section in, or with, or
-    specifically for use in, a User Product, and the conveying occurs as
-    part of a transaction in which the right of possession and use of the
-    User Product is transferred to the recipient in perpetuity or for a
-    fixed term (regardless of how the transaction is characterized), the
-    Corresponding Source conveyed under this section must be accompanied
-    by the Installation Information.  But this requirement does not apply
-    if neither you nor any third party retains the ability to install
-    modified object code on the User Product (for example, the work has
-    been installed in ROM).</p>
-
-  <p>The requirement to provide Installation Information does not include a
-    requirement to continue to provide support service, warranty, or updates
-    for a work that has been modified or installed by the recipient, or for
-    the User Product in which it has been modified or installed.  Access to a
-    network may be denied when the modification itself materially and
-    adversely affects the operation of the network or violates the rules and
-    protocols for communication across the network.</p>
-
-  <p>Corresponding Source conveyed, and Installation Information provided,
-    in accord with this section must be in a format that is publicly
-    documented (and with an implementation available to the public in
-    source code form), and must require no special password or key for
-    unpacking, reading or copying.</p>
-
-  <h4 id="section7">7. Additional Terms.</h4>
-
-  <p>&quot;Additional permissions&quot; are terms that supplement the terms of this
-    License by making exceptions from one or more of its conditions.
-    Additional permissions that are applicable to the entire Program shall
-    be treated as though they were included in this License, to the extent
-    that they are valid under applicable law.  If additional permissions
-    apply only to part of the Program, that part may be used separately
-    under those permissions, but the entire Program remains governed by
-    this License without regard to the additional permissions.</p>
-
-  <p>When you convey a copy of a covered work, you may at your option
-    remove any additional permissions from that copy, or from any part of
-    it.  (Additional permissions may be written to require their own
-    removal in certain cases when you modify the work.)  You may place
-    additional permissions on material, added by you to a covered work,
-    for which you have or can give appropriate copyright permission.</p>
-
-  <p>Notwithstanding any other provision of this License, for material you
-    add to a covered work, you may (if authorized by the copyright holders of
-    that material) supplement the terms of this License with terms:</p>
-
-  <ul>
-
-    <li>a) Disclaiming warranty or limiting liability differently from the
-      terms of sections 15 and 16 of this License; or</li>
-
-    <li>b) Requiring preservation of specified reasonable legal notices or
-      author attributions in that material or in the Appropriate Legal
-      Notices displayed by works containing it; or</li>
-
-    <li>c) Prohibiting misrepresentation of the origin of that material, or
-      requiring that modified versions of such material be marked in
-      reasonable ways as different from the original version; or</li>
-
-    <li>d) Limiting the use for publicity purposes of names of licensors or
-      authors of the material; or</li>
-
-    <li>e) Declining to grant rights under trademark law for use of some
-      trade names, trademarks, or service marks; or</li>
-
-    <li>f) Requiring indemnification of licensors and authors of that
-      material by anyone who conveys the material (or modified versions of
-      it) with contractual assumptions of liability to the recipient, for
-      any liability that these contractual assumptions directly impose on
-      those licensors and authors.</li>
-
-  </ul>
-
-  <p>All other non-permissive additional terms are considered &quot;further
-    restrictions&quot; within the meaning of section 10.  If the Program as you
-    received it, or any part of it, contains a notice stating that it is
-    governed by this License along with a term that is a further restriction,
-    you may remove that term.  If a license document contains a further
-    restriction but permits relicensing or conveying under this License, you
-    may add to a covered work material governed by the terms of that license
-    document, provided that the further restriction does not survive such
-    relicensing or conveying.</p>
-
-  <p>If you add terms to a covered work in accord with this section, you
-    must place, in the relevant source files, a statement of the
-    additional terms that apply to those files, or a notice indicating
-    where to find the applicable terms.</p>
-
-  <p>Additional terms, permissive or non-permissive, may be stated in the
-    form of a separately written license, or stated as exceptions;
-    the above requirements apply either way.</p>
-
-  <h4 id="section8">8. Termination.</h4>
-
-  <p>You may not propagate or modify a covered work except as expressly
-    provided under this License.  Any attempt otherwise to propagate or
-    modify it is void, and will automatically terminate your rights under
-    this License (including any patent licenses granted under the third
-    paragraph of section 11).</p>
-
-  <p>However, if you cease all violation of this License, then your
-    license from a particular copyright holder is reinstated (a)
-    provisionally, unless and until the copyright holder explicitly and
-    finally terminates your license, and (b) permanently, if the copyright
-    holder fails to notify you of the violation by some reasonable means
-    prior to 60 days after the cessation.</p>
-
-  <p>Moreover, your license from a particular copyright holder is
-    reinstated permanently if the copyright holder notifies you of the
-    violation by some reasonable means, this is the first time you have
-    received notice of violation of this License (for any work) from that
-    copyright holder, and you cure the violation prior to 30 days after
-    your receipt of the notice.</p>
-
-  <p>Termination of your rights under this section does not terminate the
-    licenses of parties who have received copies or rights from you under
-    this License.  If your rights have been terminated and not permanently
-    reinstated, you do not qualify to receive new licenses for the same
-    material under section 10.</p>
-
-  <h4 id="section9">9. Acceptance Not Required for Having Copies.</h4>
-
-  <p>You are not required to accept this License in order to receive or
-    run a copy of the Program.  Ancillary propagation of a covered work
-    occurring solely as a consequence of using peer-to-peer transmission
-    to receive a copy likewise does not require acceptance.  However,
-    nothing other than this License grants you permission to propagate or
-    modify any covered work.  These actions infringe copyright if you do
-    not accept this License.  Therefore, by modifying or propagating a
-    covered work, you indicate your acceptance of this License to do so.</p>
-
-  <h4 id="section10">10. Automatic Licensing of Downstream Recipients.</h4>
-
-  <p>Each time you convey a covered work, the recipient automatically
-    receives a license from the original licensors, to run, modify and
-    propagate that work, subject to this License.  You are not responsible
-    for enforcing compliance by third parties with this License.</p>
-
-  <p>An &quot;entity transaction&quot; is a transaction transferring control of an
-    organization, or substantially all assets of one, or subdividing an
-    organization, or merging organizations.  If propagation of a covered
-    work results from an entity transaction, each party to that
-    transaction who receives a copy of the work also receives whatever
-    licenses to the work the party's predecessor in interest had or could
-    give under the previous paragraph, plus a right to possession of the
-    Corresponding Source of the work from the predecessor in interest, if
-    the predecessor has it or can get it with reasonable efforts.</p>
-
-  <p>You may not impose any further restrictions on the exercise of the
-    rights granted or affirmed under this License.  For example, you may
-    not impose a license fee, royalty, or other charge for exercise of
-    rights granted under this License, and you may not initiate litigation
-    (including a cross-claim or counterclaim in a lawsuit) alleging that
-    any patent claim is infringed by making, using, selling, offering for
-    sale, or importing the Program or any portion of it.</p>
-
-  <h4 id="section11">11. Patents.</h4>
-
-  <p>A &quot;contributor&quot; is a copyright holder who authorizes use under this
-    License of the Program or a work on which the Program is based.  The
-    work thus licensed is called the contributor's &quot;contributor version&quot;.</p>
-
-  <p>A contributor's &quot;essential patent claims&quot; are all patent claims
-    owned or controlled by the contributor, whether already acquired or
-    hereafter acquired, that would be infringed by some manner, permitted
-    by this License, of making, using, or selling its contributor version,
-    but do not include claims that would be infringed only as a
-    consequence of further modification of the contributor version.  For
-    purposes of this definition, &quot;control&quot; includes the right to grant
-    patent sublicenses in a manner consistent with the requirements of
-    this License.</p>
-
-  <p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-    patent license under the contributor's essential patent claims, to
-    make, use, sell, offer for sale, import and otherwise run, modify and
-    propagate the contents of its contributor version.</p>
-
-  <p>In the following three paragraphs, a &quot;patent license&quot; is any express
-    agreement or commitment, however denominated, not to enforce a patent
-    (such as an express permission to practice a patent or covenant not to
-    sue for patent infringement).  To &quot;grant&quot; such a patent license to a
-    party means to make such an agreement or commitment not to enforce a
-    patent against the party.</p>
-
-  <p>If you convey a covered work, knowingly relying on a patent license,
-    and the Corresponding Source of the work is not available for anyone
-    to copy, free of charge and under the terms of this License, through a
-    publicly available network server or other readily accessible means,
-    then you must either (1) cause the Corresponding Source to be so
-    available, or (2) arrange to deprive yourself of the benefit of the
-    patent license for this particular work, or (3) arrange, in a manner
-    consistent with the requirements of this License, to extend the patent
-    license to downstream recipients.  &quot;Knowingly relying&quot; means you have
-    actual knowledge that, but for the patent license, your conveying the
-    covered work in a country, or your recipient's use of the covered work
-    in a country, would infringe one or more identifiable patents in that
-    country that you have reason to believe are valid.</p>
-
-  <p>If, pursuant to or in connection with a single transaction or
-    arrangement, you convey, or propagate by procuring conveyance of, a
-    covered work, and grant a patent license to some of the parties
-    receiving the covered work authorizing them to use, propagate, modify
-    or convey a specific copy of the covered work, then the patent license
-    you grant is automatically extended to all recipients of the covered
-    work and works based on it.</p>
-
-  <p>A patent license is &quot;discriminatory&quot; if it does not include within
-    the scope of its coverage, prohibits the exercise of, or is
-    conditioned on the non-exercise of one or more of the rights that are
-    specifically granted under this License.  You may not convey a covered
-    work if you are a party to an arrangement with a third party that is
-    in the business of distributing software, under which you make payment
-    to the third party based on the extent of your activity of conveying
-    the work, and under which the third party grants, to any of the
-    parties who would receive the covered work from you, a discriminatory
-    patent license (a) in connection with copies of the covered work
-    conveyed by you (or copies made from those copies), or (b) primarily
-    for and in connection with specific products or compilations that
-    contain the covered work, unless you entered into that arrangement,
-    or that patent license was granted, prior to 28 March 2007.</p>
-
-  <p>Nothing in this License shall be construed as excluding or limiting
-    any implied license or other defenses to infringement that may
-    otherwise be available to you under applicable patent law.</p>
-
-  <h4 id="section12">12. No Surrender of Others' Freedom.</h4>
-
-  <p>If conditions are imposed on you (whether by court order, agreement or
-    otherwise) that contradict the conditions of this License, they do not
-    excuse you from the conditions of this License.  If you cannot convey a
-    covered work so as to satisfy simultaneously your obligations under this
-    License and any other pertinent obligations, then as a consequence you may
-    not convey it at all.  For example, if you agree to terms that obligate you
-    to collect a royalty for further conveying from those to whom you convey
-    the Program, the only way you could satisfy both those terms and this
-    License would be to refrain entirely from conveying the Program.</p>
-
-  <h4 id="section13">13. Remote Network Interaction; Use with the GNU General Public License.</h4>
-
-  <p>Notwithstanding any other provision of this License, if you modify the
-    Program, your modified version must prominently offer all users
-    interacting with it remotely through a computer network (if your version
-    supports such interaction) an opportunity to receive the Corresponding
-    Source of your version by providing access to the Corresponding Source
-    from a network server at no charge, through some standard or customary
-    means of facilitating copying of software.  This Corresponding Source
-    shall include the Corresponding Source for any work covered by version 3
-    of the GNU General Public License that is incorporated pursuant to the
-    following paragraph.</p>
-
-  <p>Notwithstanding any other provision of this License, you have permission
-    to link or combine any covered work with a work licensed under version 3
-    of the GNU General Public License into a single combined work, and to
-    convey the resulting work.  The terms of this License will continue to
-    apply to the part which is the covered work, but the work with which it is
-    combined will remain governed by version 3 of the GNU General Public
-    License.</p>
-
-  <h4 id="section14">14. Revised Versions of this License.</h4>
-
-  <p>The Free Software Foundation may publish revised and/or new versions of
-    the GNU Affero General Public License from time to time.  Such new
-    versions will be similar in spirit to the present version, but may differ
-    in detail to address new problems or concerns.</p>
-
-  <p>Each version is given a distinguishing version number.  If the
-    Program specifies that a certain numbered version of the GNU Affero
-    General Public License &quot;or any later version&quot; applies to it, you have
-    the option of following the terms and conditions either of that
-    numbered version or of any later version published by the Free
-    Software Foundation.  If the Program does not specify a version number
-    of the GNU Affero General Public License, you may choose any version
-    ever published by the Free Software Foundation.</p>
-
-  <p>If the Program specifies that a proxy can decide which future
-    versions of the GNU Affero General Public License can be used, that
-    proxy's public statement of acceptance of a version permanently
-    authorizes you to choose that version for the Program.</p>
-
-  <p>Later license versions may give you additional or different
-    permissions.  However, no additional obligations are imposed on any
-    author or copyright holder as a result of your choosing to follow a
-    later version.</p>
-
-  <h4 id="section15">15. Disclaimer of Warranty.</h4>
-
-  <p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-    APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-    HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY
-    OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-    IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-    ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-
-  <h4 id="section16">16. Limitation of Liability.</h4>
-
-  <p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-    THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-    GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-    USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-    DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-    PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-    EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGES.</p>
-
-  <h4 id="section17">17. Interpretation of Sections 15 and 16.</h4>
-
-  <p>If the disclaimer of warranty and limitation of liability provided
-    above cannot be given local legal effect according to their terms,
-    reviewing courts shall apply local law that most closely approximates
-    an absolute waiver of all civil liability in connection with the
-    Program, unless a warranty or assumption of liability accompanies a
-    copy of the Program in return for a fee.</p>
-
-  <p>END OF TERMS AND CONDITIONS</p>
-
-  <h4 id="howto">How to Apply These Terms to Your New Programs</h4>
-
-  <p>If you develop a new program, and you want it to be of the greatest
-    possible use to the public, the best way to achieve this is to make it
-    free software which everyone can redistribute and change under these terms.</p>
-
-  <p>To do so, attach the following notices to the program.  It is safest
-    to attach them to the start of each source file to most effectively
-    state the exclusion of warranty; and each file should have at least
-    the &quot;copyright&quot; line and a pointer to where the full notice is found.</p>
-
-  <pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
-  </pre>
-
-  <p>Also add information on how to contact you by electronic and paper mail.</p>
-
-  <p>If your software can interact with users remotely through a computer
-    network, you should also make sure that it provides a way for users to
-    get its source.  For example, if your program is a web application, its
-    interface could display a &quot;Source&quot; link that leads users to an archive
-    of the code.  There are many ways you could offer source, and different
-    solutions will be better for different programs; see section 13 for the
-    specific requirements.</p>
-
-  <p>You should also get your employer (if you work as a programmer) or school,
-    if any, to sign a &quot;copyright disclaimer&quot; for the program, if necessary.
-    For more information on this, and how to apply and follow the GNU AGPL, see
-    &lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.</p>
-</div>
diff --git a/templates/about.tt b/templates/about.tt
new file mode 100644
index 0000000..0f3d690
--- /dev/null
+++ b/templates/about.tt
@@ -0,0 +1,28 @@
+<div class="simple-page">
+    <div class="about-header">
+        <h1><img id="about-icon" src="/treebird_logo.png"> <span>Treebird</span></h1>
+    </div>
+    <div class="about-content">
+        <p>Treebird is a Pleroma frontend that is lightweight, efficient, and true to the web. It's written in C with FCGI making it simple and fast to work with and deploy. It is very tight to the philosophy of how the internet has always worked; Javascript provides extra sugar (or scripting) to improve the experience but not a requirement, while still being simple enough that anyone can use it.</p>
+
+        <p>Treebird was created in response to PleromaFE performance issues and ironically a lack of PleromaAPI backend support. Treebird resembles GNU Social in appearance by default, but keeps the familiarity that many are used to of PleromaFE.</p>
+
+        <p>Treebird was created by <a href="/@nekobit@rdrama.cc">Nekobit</a>, who created <a href="https://fossil.nekobit.net/mastodont-c/home">mastodont-c</a>, a library that can communicate with Revolver's, Pleroma's, and Mastodon's REST APIs.</p>
+
+        <h3>Other contributors</h3>
+        <ul>
+            <li><a href="/@coyote@pl.lain.sh" alt="Created Solarized themes for Treebird">Coyote</a></li>
+            <li><a href="/@grumbulon@freecumextremist.com" alt="Helped with the original dark theme, and created the original treebird.dev website">Grumbulon</a></li>
+            <li><a href="/@khan@sleepy.cafe" alt="Started idea of treebird">Khan</a></li>
+            <li><a href="/@sam@froth.zone" alt="Testing with Nginx and documentation">SamTherapy</a></li>
+            <li><a href="/@pch_xyz@seediqbale.xyz" alt="Chinese (Traditional) translations">Pacific Coast Highway (pch_xyz)</a></li>
+        </ul>
+
+        <p>Treebird is licensed in AGPLv3, and mastodont-c is LGPLv3 licensed. Other licenses apply to libraries as well. <a href="/about/license">View the AGPLv3 license here.</a></p>
+
+        <a class="btn btn-single" href="https://fossil.nekobit.net/treebird/home">View the Fossil Repository</a> <a class="btn btn-single" href="/about/license">View the License</a>
+    </div>
+</div>
+
+<!-- Scripts -->
+<script src="/js/worm.js"></script>
diff --git a/templates/config_general.tt b/templates/config_general.tt
index c8bf934..99e0b14 100644
--- a/templates/config_general.tt
+++ b/templates/config_general.tt
@@ -10,9 +10,9 @@
             <li>
                 <label for="cfglang">Language:</label>
                 <select name="lang" id="cfglang">
-                    <option value="0">English</option>
-                    <option value="1">Spanish</option>
-                    <option value="2">Chinese (Traditional)</option>
+                    <option value="0"[% IF ssn.config.lang == 0 %] selected [% END %]>English</option>
+                    <option value="1"[% IF ssn.config.lang == 1 %] selected [% END %]>Spanish</option>
+                    <option value="2"[% IF ssn.config.lang == 2 %] selected [% END %]>Chinese (Traditional)</option>
                 </select>
             </li>
         </ul>
diff --git a/templates/license.tt b/templates/license.tt
new file mode 100644
index 0000000..e7c45ef
--- /dev/null
+++ b/templates/license.tt
@@ -0,0 +1,680 @@
+<div class="simple-page">
+    <h1>License</h1>
+    <h3 style="text-align: center;">GNU AFFERO GENERAL PUBLIC LICENSE</h3>
+    <p style="text-align: center;">Version 3, 19 November 2007</p>
+
+    <p>Copyright &copy; 2007 Free Software Foundation,
+        Inc. &lt;<a href="https://fsf.org/">https://fsf.org/</a>&gt;
+        <br />
+        Everyone is permitted to copy and distribute verbatim copies
+        of this license document, but changing it is not allowed.</p>
+
+        <h4 id="preamble">Preamble</h4>
+
+        <p>The GNU Affero General Public License is a free, copyleft license
+            for software and other kinds of works, specifically designed to ensure
+            cooperation with the community in the case of network server software.</p>
+
+        <p>The licenses for most software and other practical works are
+            designed to take away your freedom to share and change the works.  By
+            contrast, our General Public Licenses are intended to guarantee your
+            freedom to share and change all versions of a program--to make sure it
+            remains free software for all its users.</p>
+
+        <p>When we speak of free software, we are referring to freedom, not
+            price.  Our General Public Licenses are designed to make sure that you
+            have the freedom to distribute copies of free software (and charge for
+            them if you wish), that you receive source code or can get it if you
+            want it, that you can change the software or use pieces of it in new
+            free programs, and that you know you can do these things.</p>
+
+        <p>Developers that use our General Public Licenses protect your rights
+            with two steps: (1) assert copyright on the software, and (2) offer
+            you this License which gives you legal permission to copy, distribute
+            and/or modify the software.</p>
+
+        <p>A secondary benefit of defending all users' freedom is that
+            improvements made in alternate versions of the program, if they
+            receive widespread use, become available for other developers to
+            incorporate.  Many developers of free software are heartened and
+            encouraged by the resulting cooperation.  However, in the case of
+            software used on network servers, this result may fail to come about.
+            The GNU General Public License permits making a modified version and
+            letting the public access it on a server without ever releasing its
+            source code to the public.</p>
+
+        <p>The GNU Affero General Public License is designed specifically to
+            ensure that, in such cases, the modified source code becomes available
+            to the community.  It requires the operator of a network server to
+            provide the source code of the modified version running there to the
+            users of that server.  Therefore, public use of a modified version, on
+            a publicly accessible server, gives the public access to the source
+            code of the modified version.</p>
+
+        <p>An older license, called the Affero General Public License and
+            published by Affero, was designed to accomplish similar goals.  This is
+            a different license, not a version of the Affero GPL, but Affero has
+            released a new version of the Affero GPL which permits relicensing under
+            this license.</p>
+
+        <p>The precise terms and conditions for copying, distribution and
+            modification follow.</p>
+
+        <h4 id="terms">TERMS AND CONDITIONS</h4>
+
+        <h4 id="section0">0. Definitions.</h4>
+
+        <p>&quot;This License&quot; refers to version 3 of the GNU Affero General Public
+            License.</p>
+
+        <p>&quot;Copyright&quot; also means copyright-like laws that apply to other kinds
+            of works, such as semiconductor masks.</p>
+
+        <p>&quot;The Program&quot; refers to any copyrightable work licensed under this
+            License.  Each licensee is addressed as &quot;you&quot;.  &quot;Licensees&quot; and
+            &quot;recipients&quot; may be individuals or organizations.</p>
+
+        <p>To &quot;modify&quot; a work means to copy from or adapt all or part of the work
+            in a fashion requiring copyright permission, other than the making of an
+            exact copy.  The resulting work is called a &quot;modified version&quot; of the
+            earlier work or a work &quot;based on&quot; the earlier work.</p>
+
+        <p>A &quot;covered work&quot; means either the unmodified Program or a work based
+            on the Program.</p>
+
+        <p>To &quot;propagate&quot; a work means to do anything with it that, without
+            permission, would make you directly or secondarily liable for
+            infringement under applicable copyright law, except executing it on a
+            computer or modifying a private copy.  Propagation includes copying,
+            distribution (with or without modification), making available to the
+            public, and in some countries other activities as well.</p>
+
+        <p>To &quot;convey&quot; a work means any kind of propagation that enables other
+            parties to make or receive copies.  Mere interaction with a user through
+            a computer network, with no transfer of a copy, is not conveying.</p>
+
+        <p>An interactive user interface displays &quot;Appropriate Legal Notices&quot;
+            to the extent that it includes a convenient and prominently visible
+            feature that (1) displays an appropriate copyright notice, and (2)
+            tells the user that there is no warranty for the work (except to the
+            extent that warranties are provided), that licensees may convey the
+            work under this License, and how to view a copy of this License.  If
+            the interface presents a list of user commands or options, such as a
+            menu, a prominent item in the list meets this criterion.</p>
+
+        <h4 id="section1">1. Source Code.</h4>
+
+        <p>The &quot;source code&quot; for a work means the preferred form of the work
+            for making modifications to it.  &quot;Object code&quot; means any non-source
+            form of a work.</p>
+
+        <p>A &quot;Standard Interface&quot; means an interface that either is an official
+            standard defined by a recognized standards body, or, in the case of
+            interfaces specified for a particular programming language, one that
+            is widely used among developers working in that language.</p>
+
+        <p>The &quot;System Libraries&quot; of an executable work include anything, other
+            than the work as a whole, that (a) is included in the normal form of
+            packaging a Major Component, but which is not part of that Major
+            Component, and (b) serves only to enable use of the work with that
+            Major Component, or to implement a Standard Interface for which an
+            implementation is available to the public in source code form.  A
+            &quot;Major Component&quot;, in this context, means a major essential component
+            (kernel, window system, and so on) of the specific operating system
+            (if any) on which the executable work runs, or a compiler used to
+            produce the work, or an object code interpreter used to run it.</p>
+
+        <p>The &quot;Corresponding Source&quot; for a work in object code form means all
+            the source code needed to generate, install, and (for an executable
+            work) run the object code and to modify the work, including scripts to
+            control those activities.  However, it does not include the work's
+            System Libraries, or general-purpose tools or generally available free
+            programs which are used unmodified in performing those activities but
+            which are not part of the work.  For example, Corresponding Source
+            includes interface definition files associated with source files for
+            the work, and the source code for shared libraries and dynamically
+            linked subprograms that the work is specifically designed to require,
+            such as by intimate data communication or control flow between those
+            subprograms and other parts of the work.</p>
+
+        <p>The Corresponding Source need not include anything that users
+            can regenerate automatically from other parts of the Corresponding
+            Source.</p>
+
+        <p>The Corresponding Source for a work in source code form is that
+            same work.</p>
+
+        <h4 id="section2">2. Basic Permissions.</h4>
+
+        <p>All rights granted under this License are granted for the term of
+            copyright on the Program, and are irrevocable provided the stated
+            conditions are met.  This License explicitly affirms your unlimited
+            permission to run the unmodified Program.  The output from running a
+            covered work is covered by this License only if the output, given its
+            content, constitutes a covered work.  This License acknowledges your
+            rights of fair use or other equivalent, as provided by copyright law.</p>
+
+        <p>You may make, run and propagate covered works that you do not
+            convey, without conditions so long as your license otherwise remains
+            in force.  You may convey covered works to others for the sole purpose
+            of having them make modifications exclusively for you, or provide you
+            with facilities for running those works, provided that you comply with
+            the terms of this License in conveying all material for which you do
+            not control copyright.  Those thus making or running the covered works
+            for you must do so exclusively on your behalf, under your direction
+            and control, on terms that prohibit them from making any copies of
+            your copyrighted material outside their relationship with you.</p>
+
+        <p>Conveying under any other circumstances is permitted solely under
+            the conditions stated below.  Sublicensing is not allowed; section 10
+            makes it unnecessary.</p>
+
+        <h4 id="section3">3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+        <p>No covered work shall be deemed part of an effective technological
+            measure under any applicable law fulfilling obligations under article
+            11 of the WIPO copyright treaty adopted on 20 December 1996, or
+            similar laws prohibiting or restricting circumvention of such
+            measures.</p>
+
+        <p>When you convey a covered work, you waive any legal power to forbid
+            circumvention of technological measures to the extent such circumvention
+            is effected by exercising rights under this License with respect to
+            the covered work, and you disclaim any intention to limit operation or
+            modification of the work as a means of enforcing, against the work's
+            users, your or third parties' legal rights to forbid circumvention of
+            technological measures.</p>
+
+        <h4 id="section4">4. Conveying Verbatim Copies.</h4>
+
+        <p>You may convey verbatim copies of the Program's source code as you
+            receive it, in any medium, provided that you conspicuously and
+            appropriately publish on each copy an appropriate copyright notice;
+            keep intact all notices stating that this License and any
+            non-permissive terms added in accord with section 7 apply to the code;
+            keep intact all notices of the absence of any warranty; and give all
+            recipients a copy of this License along with the Program.</p>
+
+        <p>You may charge any price or no price for each copy that you convey,
+            and you may offer support or warranty protection for a fee.</p>
+
+        <h4 id="section5">5. Conveying Modified Source Versions.</h4>
+
+        <p>You may convey a work based on the Program, or the modifications to
+            produce it from the Program, in the form of source code under the
+            terms of section 4, provided that you also meet all of these conditions:</p>
+
+        <ul>
+
+            <li>a) The work must carry prominent notices stating that you modified
+                it, and giving a relevant date.</li>
+
+            <li>b) The work must carry prominent notices stating that it is
+                released under this License and any conditions added under section
+                7.  This requirement modifies the requirement in section 4 to
+                &quot;keep intact all notices&quot;.</li>
+
+            <li>c) You must license the entire work, as a whole, under this
+                License to anyone who comes into possession of a copy.  This
+                License will therefore apply, along with any applicable section 7
+                additional terms, to the whole of the work, and all its parts,
+                regardless of how they are packaged.  This License gives no
+                permission to license the work in any other way, but it does not
+                invalidate such permission if you have separately received it.</li>
+
+            <li>d) If the work has interactive user interfaces, each must display
+                Appropriate Legal Notices; however, if the Program has interactive
+                interfaces that do not display Appropriate Legal Notices, your
+                work need not make them do so.</li>
+
+        </ul>
+
+        <p>A compilation of a covered work with other separate and independent
+            works, which are not by their nature extensions of the covered work,
+            and which are not combined with it such as to form a larger program,
+            in or on a volume of a storage or distribution medium, is called an
+            &quot;aggregate&quot; if the compilation and its resulting copyright are not
+            used to limit the access or legal rights of the compilation's users
+            beyond what the individual works permit.  Inclusion of a covered work
+            in an aggregate does not cause this License to apply to the other
+            parts of the aggregate.</p>
+
+        <h4 id="section6">6. Conveying Non-Source Forms.</h4>
+
+        <p>You may convey a covered work in object code form under the terms
+            of sections 4 and 5, provided that you also convey the
+            machine-readable Corresponding Source under the terms of this License,
+            in one of these ways:</p>
+
+        <ul>
+
+            <li>a) Convey the object code in, or embodied in, a physical product
+                (including a physical distribution medium), accompanied by the
+                Corresponding Source fixed on a durable physical medium
+                customarily used for software interchange.</li>
+
+            <li>b) Convey the object code in, or embodied in, a physical product
+                (including a physical distribution medium), accompanied by a
+                written offer, valid for at least three years and valid for as
+                long as you offer spare parts or customer support for that product
+                model, to give anyone who possesses the object code either (1) a
+                copy of the Corresponding Source for all the software in the
+                product that is covered by this License, on a durable physical
+                medium customarily used for software interchange, for a price no
+                more than your reasonable cost of physically performing this
+                conveying of source, or (2) access to copy the
+                Corresponding Source from a network server at no charge.</li>
+
+            <li>c) Convey individual copies of the object code with a copy of the
+                written offer to provide the Corresponding Source.  This
+                alternative is allowed only occasionally and noncommercially, and
+                only if you received the object code with such an offer, in accord
+                with subsection 6b.</li>
+
+            <li>d) Convey the object code by offering access from a designated
+                place (gratis or for a charge), and offer equivalent access to the
+                Corresponding Source in the same way through the same place at no
+                further charge.  You need not require recipients to copy the
+                Corresponding Source along with the object code.  If the place to
+                copy the object code is a network server, the Corresponding Source
+                may be on a different server (operated by you or a third party)
+                that supports equivalent copying facilities, provided you maintain
+                clear directions next to the object code saying where to find the
+                Corresponding Source.  Regardless of what server hosts the
+                Corresponding Source, you remain obligated to ensure that it is
+                available for as long as needed to satisfy these requirements.</li>
+
+            <li>e) Convey the object code using peer-to-peer transmission, provided
+                you inform other peers where the object code and Corresponding
+                Source of the work are being offered to the general public at no
+                charge under subsection 6d.</li>
+
+        </ul>
+
+        <p>A separable portion of the object code, whose source code is excluded
+            from the Corresponding Source as a System Library, need not be
+            included in conveying the object code work.</p>
+
+        <p>A &quot;User Product&quot; is either (1) a &quot;consumer product&quot;, which means any
+            tangible personal property which is normally used for personal, family,
+            or household purposes, or (2) anything designed or sold for incorporation
+            into a dwelling.  In determining whether a product is a consumer product,
+            doubtful cases shall be resolved in favor of coverage.  For a particular
+            product received by a particular user, &quot;normally used&quot; refers to a
+            typical or common use of that class of product, regardless of the status
+            of the particular user or of the way in which the particular user
+            actually uses, or expects or is expected to use, the product.  A product
+            is a consumer product regardless of whether the product has substantial
+            commercial, industrial or non-consumer uses, unless such uses represent
+            the only significant mode of use of the product.</p>
+
+        <p>&quot;Installation Information&quot; for a User Product means any methods,
+            procedures, authorization keys, or other information required to install
+            and execute modified versions of a covered work in that User Product from
+            a modified version of its Corresponding Source.  The information must
+            suffice to ensure that the continued functioning of the modified object
+            code is in no case prevented or interfered with solely because
+            modification has been made.</p>
+
+        <p>If you convey an object code work under this section in, or with, or
+            specifically for use in, a User Product, and the conveying occurs as
+            part of a transaction in which the right of possession and use of the
+            User Product is transferred to the recipient in perpetuity or for a
+            fixed term (regardless of how the transaction is characterized), the
+            Corresponding Source conveyed under this section must be accompanied
+            by the Installation Information.  But this requirement does not apply
+            if neither you nor any third party retains the ability to install
+            modified object code on the User Product (for example, the work has
+            been installed in ROM).</p>
+
+        <p>The requirement to provide Installation Information does not include a
+            requirement to continue to provide support service, warranty, or updates
+            for a work that has been modified or installed by the recipient, or for
+            the User Product in which it has been modified or installed.  Access to a
+            network may be denied when the modification itself materially and
+            adversely affects the operation of the network or violates the rules and
+            protocols for communication across the network.</p>
+
+        <p>Corresponding Source conveyed, and Installation Information provided,
+            in accord with this section must be in a format that is publicly
+            documented (and with an implementation available to the public in
+            source code form), and must require no special password or key for
+            unpacking, reading or copying.</p>
+
+        <h4 id="section7">7. Additional Terms.</h4>
+
+        <p>&quot;Additional permissions&quot; are terms that supplement the terms of this
+            License by making exceptions from one or more of its conditions.
+            Additional permissions that are applicable to the entire Program shall
+            be treated as though they were included in this License, to the extent
+            that they are valid under applicable law.  If additional permissions
+            apply only to part of the Program, that part may be used separately
+            under those permissions, but the entire Program remains governed by
+            this License without regard to the additional permissions.</p>
+
+        <p>When you convey a copy of a covered work, you may at your option
+            remove any additional permissions from that copy, or from any part of
+            it.  (Additional permissions may be written to require their own
+            removal in certain cases when you modify the work.)  You may place
+            additional permissions on material, added by you to a covered work,
+            for which you have or can give appropriate copyright permission.</p>
+
+        <p>Notwithstanding any other provision of this License, for material you
+            add to a covered work, you may (if authorized by the copyright holders of
+            that material) supplement the terms of this License with terms:</p>
+
+        <ul>
+
+            <li>a) Disclaiming warranty or limiting liability differently from the
+                terms of sections 15 and 16 of this License; or</li>
+
+            <li>b) Requiring preservation of specified reasonable legal notices or
+                author attributions in that material or in the Appropriate Legal
+                Notices displayed by works containing it; or</li>
+
+            <li>c) Prohibiting misrepresentation of the origin of that material, or
+                requiring that modified versions of such material be marked in
+                reasonable ways as different from the original version; or</li>
+
+            <li>d) Limiting the use for publicity purposes of names of licensors or
+                authors of the material; or</li>
+
+            <li>e) Declining to grant rights under trademark law for use of some
+                trade names, trademarks, or service marks; or</li>
+
+            <li>f) Requiring indemnification of licensors and authors of that
+                material by anyone who conveys the material (or modified versions of
+                it) with contractual assumptions of liability to the recipient, for
+                any liability that these contractual assumptions directly impose on
+                those licensors and authors.</li>
+
+        </ul>
+
+        <p>All other non-permissive additional terms are considered &quot;further
+            restrictions&quot; within the meaning of section 10.  If the Program as you
+            received it, or any part of it, contains a notice stating that it is
+            governed by this License along with a term that is a further restriction,
+            you may remove that term.  If a license document contains a further
+            restriction but permits relicensing or conveying under this License, you
+            may add to a covered work material governed by the terms of that license
+            document, provided that the further restriction does not survive such
+            relicensing or conveying.</p>
+
+        <p>If you add terms to a covered work in accord with this section, you
+            must place, in the relevant source files, a statement of the
+            additional terms that apply to those files, or a notice indicating
+            where to find the applicable terms.</p>
+
+        <p>Additional terms, permissive or non-permissive, may be stated in the
+            form of a separately written license, or stated as exceptions;
+            the above requirements apply either way.</p>
+
+        <h4 id="section8">8. Termination.</h4>
+
+        <p>You may not propagate or modify a covered work except as expressly
+            provided under this License.  Any attempt otherwise to propagate or
+            modify it is void, and will automatically terminate your rights under
+            this License (including any patent licenses granted under the third
+            paragraph of section 11).</p>
+
+        <p>However, if you cease all violation of this License, then your
+            license from a particular copyright holder is reinstated (a)
+            provisionally, unless and until the copyright holder explicitly and
+            finally terminates your license, and (b) permanently, if the copyright
+            holder fails to notify you of the violation by some reasonable means
+            prior to 60 days after the cessation.</p>
+
+        <p>Moreover, your license from a particular copyright holder is
+            reinstated permanently if the copyright holder notifies you of the
+            violation by some reasonable means, this is the first time you have
+            received notice of violation of this License (for any work) from that
+            copyright holder, and you cure the violation prior to 30 days after
+            your receipt of the notice.</p>
+
+        <p>Termination of your rights under this section does not terminate the
+            licenses of parties who have received copies or rights from you under
+            this License.  If your rights have been terminated and not permanently
+            reinstated, you do not qualify to receive new licenses for the same
+            material under section 10.</p>
+
+        <h4 id="section9">9. Acceptance Not Required for Having Copies.</h4>
+
+        <p>You are not required to accept this License in order to receive or
+            run a copy of the Program.  Ancillary propagation of a covered work
+            occurring solely as a consequence of using peer-to-peer transmission
+            to receive a copy likewise does not require acceptance.  However,
+            nothing other than this License grants you permission to propagate or
+            modify any covered work.  These actions infringe copyright if you do
+            not accept this License.  Therefore, by modifying or propagating a
+            covered work, you indicate your acceptance of this License to do so.</p>
+
+        <h4 id="section10">10. Automatic Licensing of Downstream Recipients.</h4>
+
+        <p>Each time you convey a covered work, the recipient automatically
+            receives a license from the original licensors, to run, modify and
+            propagate that work, subject to this License.  You are not responsible
+            for enforcing compliance by third parties with this License.</p>
+
+        <p>An &quot;entity transaction&quot; is a transaction transferring control of an
+            organization, or substantially all assets of one, or subdividing an
+            organization, or merging organizations.  If propagation of a covered
+            work results from an entity transaction, each party to that
+            transaction who receives a copy of the work also receives whatever
+            licenses to the work the party's predecessor in interest had or could
+            give under the previous paragraph, plus a right to possession of the
+            Corresponding Source of the work from the predecessor in interest, if
+            the predecessor has it or can get it with reasonable efforts.</p>
+
+        <p>You may not impose any further restrictions on the exercise of the
+            rights granted or affirmed under this License.  For example, you may
+            not impose a license fee, royalty, or other charge for exercise of
+            rights granted under this License, and you may not initiate litigation
+            (including a cross-claim or counterclaim in a lawsuit) alleging that
+            any patent claim is infringed by making, using, selling, offering for
+            sale, or importing the Program or any portion of it.</p>
+
+        <h4 id="section11">11. Patents.</h4>
+
+        <p>A &quot;contributor&quot; is a copyright holder who authorizes use under this
+            License of the Program or a work on which the Program is based.  The
+            work thus licensed is called the contributor's &quot;contributor version&quot;.</p>
+
+        <p>A contributor's &quot;essential patent claims&quot; are all patent claims
+            owned or controlled by the contributor, whether already acquired or
+            hereafter acquired, that would be infringed by some manner, permitted
+            by this License, of making, using, or selling its contributor version,
+            but do not include claims that would be infringed only as a
+            consequence of further modification of the contributor version.  For
+            purposes of this definition, &quot;control&quot; includes the right to grant
+            patent sublicenses in a manner consistent with the requirements of
+            this License.</p>
+
+        <p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+            patent license under the contributor's essential patent claims, to
+            make, use, sell, offer for sale, import and otherwise run, modify and
+            propagate the contents of its contributor version.</p>
+
+        <p>In the following three paragraphs, a &quot;patent license&quot; is any express
+            agreement or commitment, however denominated, not to enforce a patent
+            (such as an express permission to practice a patent or covenant not to
+            sue for patent infringement).  To &quot;grant&quot; such a patent license to a
+            party means to make such an agreement or commitment not to enforce a
+            patent against the party.</p>
+
+        <p>If you convey a covered work, knowingly relying on a patent license,
+            and the Corresponding Source of the work is not available for anyone
+            to copy, free of charge and under the terms of this License, through a
+            publicly available network server or other readily accessible means,
+            then you must either (1) cause the Corresponding Source to be so
+            available, or (2) arrange to deprive yourself of the benefit of the
+            patent license for this particular work, or (3) arrange, in a manner
+            consistent with the requirements of this License, to extend the patent
+            license to downstream recipients.  &quot;Knowingly relying&quot; means you have
+            actual knowledge that, but for the patent license, your conveying the
+            covered work in a country, or your recipient's use of the covered work
+            in a country, would infringe one or more identifiable patents in that
+            country that you have reason to believe are valid.</p>
+
+        <p>If, pursuant to or in connection with a single transaction or
+            arrangement, you convey, or propagate by procuring conveyance of, a
+            covered work, and grant a patent license to some of the parties
+            receiving the covered work authorizing them to use, propagate, modify
+            or convey a specific copy of the covered work, then the patent license
+            you grant is automatically extended to all recipients of the covered
+            work and works based on it.</p>
+
+        <p>A patent license is &quot;discriminatory&quot; if it does not include within
+            the scope of its coverage, prohibits the exercise of, or is
+            conditioned on the non-exercise of one or more of the rights that are
+            specifically granted under this License.  You may not convey a covered
+            work if you are a party to an arrangement with a third party that is
+            in the business of distributing software, under which you make payment
+            to the third party based on the extent of your activity of conveying
+            the work, and under which the third party grants, to any of the
+            parties who would receive the covered work from you, a discriminatory
+            patent license (a) in connection with copies of the covered work
+            conveyed by you (or copies made from those copies), or (b) primarily
+            for and in connection with specific products or compilations that
+            contain the covered work, unless you entered into that arrangement,
+            or that patent license was granted, prior to 28 March 2007.</p>
+
+        <p>Nothing in this License shall be construed as excluding or limiting
+            any implied license or other defenses to infringement that may
+            otherwise be available to you under applicable patent law.</p>
+
+        <h4 id="section12">12. No Surrender of Others' Freedom.</h4>
+
+        <p>If conditions are imposed on you (whether by court order, agreement or
+            otherwise) that contradict the conditions of this License, they do not
+            excuse you from the conditions of this License.  If you cannot convey a
+            covered work so as to satisfy simultaneously your obligations under this
+            License and any other pertinent obligations, then as a consequence you may
+            not convey it at all.  For example, if you agree to terms that obligate you
+            to collect a royalty for further conveying from those to whom you convey
+            the Program, the only way you could satisfy both those terms and this
+            License would be to refrain entirely from conveying the Program.</p>
+
+        <h4 id="section13">13. Remote Network Interaction; Use with the GNU General Public License.</h4>
+
+        <p>Notwithstanding any other provision of this License, if you modify the
+            Program, your modified version must prominently offer all users
+            interacting with it remotely through a computer network (if your version
+            supports such interaction) an opportunity to receive the Corresponding
+            Source of your version by providing access to the Corresponding Source
+            from a network server at no charge, through some standard or customary
+            means of facilitating copying of software.  This Corresponding Source
+            shall include the Corresponding Source for any work covered by version 3
+            of the GNU General Public License that is incorporated pursuant to the
+            following paragraph.</p>
+
+        <p>Notwithstanding any other provision of this License, you have permission
+            to link or combine any covered work with a work licensed under version 3
+            of the GNU General Public License into a single combined work, and to
+            convey the resulting work.  The terms of this License will continue to
+            apply to the part which is the covered work, but the work with which it is
+            combined will remain governed by version 3 of the GNU General Public
+            License.</p>
+
+        <h4 id="section14">14. Revised Versions of this License.</h4>
+
+        <p>The Free Software Foundation may publish revised and/or new versions of
+            the GNU Affero General Public License from time to time.  Such new
+            versions will be similar in spirit to the present version, but may differ
+            in detail to address new problems or concerns.</p>
+
+        <p>Each version is given a distinguishing version number.  If the
+            Program specifies that a certain numbered version of the GNU Affero
+            General Public License &quot;or any later version&quot; applies to it, you have
+            the option of following the terms and conditions either of that
+            numbered version or of any later version published by the Free
+            Software Foundation.  If the Program does not specify a version number
+            of the GNU Affero General Public License, you may choose any version
+            ever published by the Free Software Foundation.</p>
+
+        <p>If the Program specifies that a proxy can decide which future
+            versions of the GNU Affero General Public License can be used, that
+            proxy's public statement of acceptance of a version permanently
+            authorizes you to choose that version for the Program.</p>
+
+        <p>Later license versions may give you additional or different
+            permissions.  However, no additional obligations are imposed on any
+            author or copyright holder as a result of your choosing to follow a
+            later version.</p>
+
+        <h4 id="section15">15. Disclaimer of Warranty.</h4>
+
+        <p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+            APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+            HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY
+            OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+            THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+            PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+            IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+            ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
+
+        <h4 id="section16">16. Limitation of Liability.</h4>
+
+        <p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+            WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+            THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+            GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+            USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+            DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+            PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+            EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+            SUCH DAMAGES.</p>
+
+        <h4 id="section17">17. Interpretation of Sections 15 and 16.</h4>
+
+        <p>If the disclaimer of warranty and limitation of liability provided
+            above cannot be given local legal effect according to their terms,
+            reviewing courts shall apply local law that most closely approximates
+            an absolute waiver of all civil liability in connection with the
+            Program, unless a warranty or assumption of liability accompanies a
+            copy of the Program in return for a fee.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h4 id="howto">How to Apply These Terms to Your New Programs</h4>
+
+        <p>If you develop a new program, and you want it to be of the greatest
+            possible use to the public, the best way to achieve this is to make it
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            state the exclusion of warranty; and each file should have at least
+            the &quot;copyright&quot; line and a pointer to where the full notice is found.</p>
+
+        <pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
+        </pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If your software can interact with users remotely through a computer
+            network, you should also make sure that it provides a way for users to
+            get its source.  For example, if your program is a web application, its
+            interface could display a &quot;Source&quot; link that leads users to an archive
+            of the code.  There are many ways you could offer source, and different
+            solutions will be better for different programs; see section 13 for the
+            specific requirements.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a &quot;copyright disclaimer&quot; for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU AGPL, see
+            &lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.</p>
+</div>

From 4db0dea58b53a44f38acf05b87bef5e4fcaf2b1b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 15:30:49 +0000
Subject: [PATCH 100/143] Broken redirect

FossilOrigin-Name: 72feef8ae694f79bab1eb6295b38e07b3b70cc16722490fac7751a6002a799fe
---
 src/query.c       |  3 ++
 src/query.h       |  1 +
 src/search.c      | 95 ++++++++++++++---------------------------------
 templates/main.tt |  9 +++--
 4 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/src/query.c b/src/query.c
index ede43f2..4943799 100644
--- a/src/query.c
+++ b/src/query.c
@@ -37,6 +37,7 @@ char* read_get_data(FCGX_Request* req, struct get_values* query)
         { "offset", &(query->offset), key_string },
         { "q", &(query->query), key_string },
         { "code", &(query->code), key_string },
+        { "type", &(query->type), key_int },
     };
     // END Query references
     
@@ -263,6 +264,7 @@ void free_files(struct file_array* files)
     free(content);
 }
 
+// TODO use hvstores_XXX macros
 HV* perlify_post_values(struct post_values* post)
 {
     HV* ssn_post_hv = newHV();
@@ -315,6 +317,7 @@ HV* perlify_get_values(struct get_values* get)
     hv_stores(ssn_query_hv, "offset", newSVpv(keystr(get->offset), 0));
     hv_stores(ssn_query_hv, "query", newSVpv(keystr(get->query), 0));
     hv_stores(ssn_query_hv, "code", newSVpv(keystr(get->code), 0));
+    hvstores_int(ssn_query_hv, "type", keyint(get->type));
     
     return ssn_query_hv;
 }
diff --git a/src/query.h b/src/query.h
index b78dfde..a7953bd 100644
--- a/src/query.h
+++ b/src/query.h
@@ -80,6 +80,7 @@ struct get_values
     struct key offset; // String
     struct key query; // String
     struct key code; // String
+    struct key type; // Int
 };
 
 char* read_get_data(FCGX_Request* req, struct get_values* query);
diff --git a/src/search.c b/src/search.c
index 89a5f2b..0863eb4 100644
--- a/src/search.c
+++ b/src/search.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdlib.h>
+#include "http.h"
 #include "helpers.h"
 #include "search.h"
 #include "easprintf.h"
@@ -83,6 +84,24 @@ void content_search_all(PATH_ARGS)
     };
     struct mstdnt_search_results results = { 0 };
 
+    // Perform redirect to correct direct page
+    if (ssn->query.type.is_set)
+    {
+        // Note: This can be zero, which is just "nothing"
+        switch (keyint(ssn->query.type))
+        {
+        case 1:
+            redirect(req, REDIRECT_303, "/search/statuses");
+            return;
+        case 2:
+            redirect(req, REDIRECT_303, "/search/accounts");
+            return;
+        case 3:
+            redirect(req, REDIRECT_303, "/search/hashtags");
+            return;
+        }
+    }
+
     mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
 
     PERL_STACK_INIT;
@@ -130,26 +149,10 @@ void content_search_statuses(PATH_ARGS)
     };
     struct mstdnt_search_results results = { 0 };
 
-    if (mastodont_search(api,
-                         &m_args,
-                         keystr(ssn->query.query),
-                         &storage,
-                         &args,
-                         &results) == 0)
-    {
-        struct construct_statuses_args statuses_args = {
-            .highlight_word = keystr(ssn->query.query),
-        };
-        statuses_html = construct_statuses(ssn, api, results.statuses, results.statuses_len, &statuses_args, NULL);
-        if (!statuses_html)
-            statuses_html = construct_error("No statuses", E_ERROR, 1, NULL);
-    }
-    else
-        statuses_html = construct_error("An error occured.", E_ERROR, 1, NULL);
-    
-    search_page(req, ssn, api, SEARCH_STATUSES, STR_NULL_EMPTY(statuses_html));
-    
-    if (statuses_html) free(statuses_html);
+    mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
+
+    // TODO
+
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
 }
@@ -158,7 +161,6 @@ void content_search_accounts(PATH_ARGS)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    char* accounts_html;
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_search_args args = {
         .account_id = NULL,
@@ -174,23 +176,10 @@ void content_search_accounts(PATH_ARGS)
     };
     struct mstdnt_search_results results = { 0 };
 
-    if (mastodont_search(api,
-                         &m_args,
-                         keystr(ssn->query.query),
-                         &storage,
-                         &args,
-                         &results) == 0)
-    {
-        accounts_html = construct_accounts(api, results.accts, results.accts_len, 0, NULL);
-        if (!accounts_html)
-            accounts_html = construct_error("No accounts", E_ERROR, 1, NULL);
-    }
-    else
-        accounts_html = construct_error("An error occured.", E_ERROR, 1, NULL);
+    mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
     
-    search_page(req, ssn, api, SEARCH_ACCOUNTS, STR_NULL_EMPTY(accounts_html));
+    // TODO
     
-    if (accounts_html) free(accounts_html);
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
 }
@@ -199,10 +188,6 @@ void content_search_hashtags(PATH_ARGS)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
-    char* tags_html;
-    char* tags_graph = NULL;
-    char* tags_bars = NULL;
-    char* tags_page;
     struct mstdnt_storage storage = { 0 };
     struct mstdnt_search_args args = {
         .account_id = NULL,
@@ -218,36 +203,10 @@ void content_search_hashtags(PATH_ARGS)
     };
     struct mstdnt_search_results results = { 0 };
 
-    if (mastodont_search(api,
-                         &m_args,
-                         keystr(ssn->query.query),
-                         &storage,
-                         &args,
-                         &results) == 0)
-    {
-        tags_html = construct_hashtags(results.tags, results.tags_len, NULL);
-        if (!tags_html)
-            tags_html = construct_error("No hashtags", E_ERROR, 1, NULL);
-
-        tags_bars = construct_hashtags_graph(results.tags,
-                                             results.tags_len,
-                                             14,
-                                             NULL);
-        if (tags_bars)
-            tags_graph = construct_bar_graph_container(tags_bars, NULL);
-        
-        if (tags_bars) free(tags_bars);
-    }
-    else
-        tags_html = construct_error("An error occured.", E_ERROR, 1, NULL);
-
-    easprintf(&tags_page, "%s%s", STR_NULL_EMPTY(tags_graph), tags_html);
+    mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
     
-    search_page(req, ssn, api, SEARCH_HASHTAGS, tags_page);
+    // TODO
     
-    if (tags_html) free(tags_html);
-    if (tags_graph) free(tags_graph);
-    free(tags_page);
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
 }
diff --git a/templates/main.tt b/templates/main.tt
index 966a0bb..5fbaadf 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -48,7 +48,8 @@
                                         <li>
                                             <label>
                                                 <div class="btn-menu">
-                                                    <input type="radio" name="searchtype" value="0" checked>
+                                                    <!-- NO-OP -->
+                                                    <input type="radio" name="type" value="0" checked>
                                                     <span>All</span>
                                                 </div>
                                             </label>
@@ -56,7 +57,7 @@
                                         <li>
                                             <label>
                                                 <div class="btn-menu">
-                                                    <input type="radio" name="searchtype" value="0">
+                                                    <input type="radio" name="type" value="1">
                                                     <span>Statuses</span>
                                                 </div>
                                             </label>
@@ -64,7 +65,7 @@
                                         <li>
                                             <label>
                                                 <div class="btn-menu">
-                                                    <input type="radio" name="searchtype" value="0">
+                                                    <input type="radio" name="type" value="2">
                                                     <span>Accounts</span>
                                                 </div>
                                             </label>
@@ -72,7 +73,7 @@
                                         <li>
                                             <label>
                                                 <div class="btn-menu">
-                                                    <input type="radio" name="searchtype" value="0">
+                                                    <input type="radio" name="type" value="3">
                                                     <span>Hashtags</span>
                                                 </div>
                                             </label>

From 785394e43555201c4c2c394884b61e6c7550695f Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 16:05:54 +0000
Subject: [PATCH 101/143] Redirect search query

FossilOrigin-Name: 92ca8377ab9c47fbd1f3348ad380ac25e0aa8b3367e5349dc63b8028f4da07e0
---
 src/search.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/search.c b/src/search.c
index 0863eb4..15d7bf8 100644
--- a/src/search.c
+++ b/src/search.c
@@ -85,21 +85,29 @@ void content_search_all(PATH_ARGS)
     struct mstdnt_search_results results = { 0 };
 
     // Perform redirect to correct direct page
-    if (ssn->query.type.is_set)
+    if (keyint(ssn->query.type))
     {
+        char* query = keystr(ssn->query.query);
+        query = curl_easy_escape(api->curl, query, 0);
+        char* url;
         // Note: This can be zero, which is just "nothing"
         switch (keyint(ssn->query.type))
         {
         case 1:
-            redirect(req, REDIRECT_303, "/search/statuses");
-            return;
+            easprintf(&url, "/search/statuses?q=%s", query);
+            redirect(req, REDIRECT_303, url);
+            break;
         case 2:
-            redirect(req, REDIRECT_303, "/search/accounts");
-            return;
+            easprintf(&url, "/search/accounts?q=%s", query);
+            redirect(req, REDIRECT_303, url);
+            break;
         case 3:
-            redirect(req, REDIRECT_303, "/search/hashtags");
-            return;
+            easprintf(&url, "/search/hashtags?q=%s", query);
+            redirect(req, REDIRECT_303, url);
+            break;
         }
+        curl_free(query);
+        return;
     }
 
     mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);

From 9bcf209e5c89a21d8d8ebe13d05c9e15cb8fbc09 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 17:00:53 +0000
Subject: [PATCH 102/143] Search tab results

FossilOrigin-Name: 68d1917ab69702c73a51670aad91abf4e6ff82ebc9278c5e70a148031f00444d
---
 dist/treebird.css            | 15 +++++++++++++
 perl/search.pm               | 10 +++++----
 src/global_perl.c            |  2 ++
 src/search.c                 | 41 ++++++++++++++++++++++++++++++++++--
 templates/search.tt          | 19 +++++++++++++++++
 templates/search_accounts.tt |  3 +++
 templates/search_statuses.tt |  3 +++
 7 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 templates/search.tt

diff --git a/dist/treebird.css b/dist/treebird.css
index 55c13d4..11beeab 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -276,6 +276,21 @@ table.ui-table td
     padding-left: 27px;
 }
 
+.results-header
+{
+    font-size: 1.4rem;
+    font-weight: normal;
+    padding: 8px 16px;
+    border-bottom: 1px solid #cacaca;
+    margin: 0;
+}
+
+.results-header .result
+{
+    font-size: 1.7rem;
+    font-weight: bold;
+}
+
 #navbar .search-menu-dropdown
 {
     display: inline;
diff --git a/perl/search.pm b/perl/search.pm
index c1ccefc..91015fb 100644
--- a/perl/search.pm
+++ b/perl/search.pm
@@ -32,12 +32,12 @@ sub search_page
 
 sub search_accounts
 {
-    my ($ssn, $data, $accounts) = @_;
+    my ($ssn, $data, $search) = @_;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
-        accounts => $accounts,
+        search => $search,
         );
 
     search_page($ssn, $data, SEARCH_CAT_ACCOUNTS, to_template(\%vars, \$data->{'search_accounts.tt'})); 
@@ -45,12 +45,14 @@ sub search_accounts
 
 sub search_statuses
 {
-    my ($ssn, $data, $statuses) = @_;
+    my ($ssn, $data, $search) = @_;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
-        statuses => $statuses,
+        search => $search,
+        
+        create_status => sub { generate_status($ssn, $data, shift); },
         );
 
     search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_statuses.tt'})); 
diff --git a/src/global_perl.c b/src/global_perl.c
index f142515..5afae6a 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -40,6 +40,7 @@
 #include "../templates/search_accounts.ctt"
 #include "../templates/search_statuses.ctt"
 #include "../templates/search_tags.ctt"
+#include "../templates/search.ctt"
 #include "../templates/content_chats.ctt"
 #include "../templates/chat.ctt"
 #include "../templates/config_general.ctt"
@@ -75,6 +76,7 @@ void init_template_files(pTHX)
     hv_stores(template_files, "accounts.tt", newSVpv(data_accounts_tt, data_accounts_tt_size));
     hv_stores(template_files, "account_item.tt", newSVpv(data_account_item_tt, data_account_item_tt_size));
     hv_stores(template_files, "content_search.tt", newSVpv(data_content_search_tt, data_content_search_tt_size));
+    hv_stores(template_files, "search.tt", newSVpv(data_search_tt, data_search_tt_size));
     hv_stores(template_files, "search_accounts.tt", newSVpv(data_search_accounts_tt, data_search_accounts_tt_size));
     hv_stores(template_files, "search_statuses.tt", newSVpv(data_search_statuses_tt, data_search_statuses_tt_size));
     hv_stores(template_files, "search_tags.tt", newSVpv(data_search_tags_tt, data_search_tags_tt_size));
diff --git a/src/search.c b/src/search.c
index 15d7bf8..46a334d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -159,10 +159,29 @@ void content_search_statuses(PATH_ARGS)
 
     mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
 
-    // TODO
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
+    
+    PERL_STACK_SCALAR_CALL("search::search_statuses");
+
+    // Duplicate so we can free the TMPs
+    char* dup = PERL_GET_STACK_EXIT;
+
+    struct base_page b = {
+        .category = BASE_CAT_NONE,
+        .content = dup,
+        .session = session_hv,
+        .sidebar_left = NULL
+    };
+
+    render_base_page(&b, req, ssn, api);
 
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
+    Safefree(dup);
 }
 
 void content_search_accounts(PATH_ARGS)
@@ -186,7 +205,25 @@ void content_search_accounts(PATH_ARGS)
 
     mastodont_search(api, &m_args, keystr(ssn->query.query), &storage, &args, &results);
     
-    // TODO
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
+    
+    PERL_STACK_SCALAR_CALL("search::search_accounts");
+
+    // Duplicate so we can free the TMPs
+    char* dup = PERL_GET_STACK_EXIT;
+
+    struct base_page b = {
+        .category = BASE_CAT_NONE,
+        .content = dup,
+        .session = session_hv,
+        .sidebar_left = NULL
+    };
+
+    render_base_page(&b, req, ssn, api);
     
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
diff --git a/templates/search.tt b/templates/search.tt
new file mode 100644
index 0000000..c2250af
--- /dev/null
+++ b/templates/search.tt
@@ -0,0 +1,19 @@
+<h1 class="results-header">Showing results for <span class="result">&quot;[% ssn.query.query %]&quot;</span></h1>
+
+<table class="tabs ui-table">
+  <tr>
+    <td>
+      <a href="/search/statuses?q="><input class="tab-btn btn[% IF tab == 0 %] active[% END %]" type="button" value="Statuses"></a>
+    </td>
+    <td>
+      <a href="/search/accounts?q="><input class="tab-btn btn[% IF tab == 1 %] active[% END %]" type="button" value="Accounts"></a>
+    </td>
+    <td>
+      <a href="/search/hashtags?q="><input class="tab-btn btn [% IF tab == 2 %] active[% END %]" type="button" value="Hashtags"></a>
+    </td>
+  </tr>
+</table>
+
+<div class="search-results">
+  [% results %]
+</div>
diff --git a/templates/search_accounts.tt b/templates/search_accounts.tt
index e69de29..ab6a2e8 100644
--- a/templates/search_accounts.tt
+++ b/templates/search_accounts.tt
@@ -0,0 +1,3 @@
+[% FOREACH i IN search.accounts %]
+    [% create_account(i); %]
+[% END %]        
diff --git a/templates/search_statuses.tt b/templates/search_statuses.tt
index e69de29..24b4e1d 100644
--- a/templates/search_statuses.tt
+++ b/templates/search_statuses.tt
@@ -0,0 +1,3 @@
+[% FOREACH i IN search.statuses %]
+    [% create_status(i); %]
+[% END %]

From 52c011968f5aa792f3b2777e64b096e01d8a117b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 17:43:42 +0000
Subject: [PATCH 103/143] Refactor search tabs

FossilOrigin-Name: 77ae2a3ad81f7655791d0431d7312dc325da8c292ada210b9a0654d4183740a8
---
 perl/search.pm               | 51 ++++++++++++++++++++++++++++++------
 src/search.c                 |  5 ++--
 templates/content_search.tt  | 16 +++++------
 templates/search.tt          |  2 +-
 templates/search_statuses.tt |  1 +
 5 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/perl/search.pm b/perl/search.pm
index 91015fb..61be55b 100644
--- a/perl/search.pm
+++ b/perl/search.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORTS = qw( content_search search_tags search_accounts search_statuses );
+our @EXPORTS = qw( content_search content_search_tags content_search_accounts content_search_statuses search_tags search_accounts search_statuses );
 
 use template_helpers 'to_template';
 use status 'generate_status';
@@ -30,20 +30,54 @@ sub search_page
     to_template(\%vars, \$data->{'search.tt'});
 }
 
+# CONTENT
 sub search_accounts
 {
     my ($ssn, $data, $search) = @_;
-
+    
     my %vars = (
         prefix => '',
         ssn => $ssn,
         search => $search,
         );
 
-    search_page($ssn, $data, SEARCH_CAT_ACCOUNTS, to_template(\%vars, \$data->{'search_accounts.tt'})); 
+    to_template(\%vars, \$data->{'search_accounts.tt'})
 }
 
 sub search_statuses
+{
+    my ($ssn, $data, $search) = @_;
+    
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        search => $search,
+        );
+
+    to_template(\%vars, \$data->{'search_statuses.tt'})
+}
+
+sub search_tags
+{
+    my ($ssn, $data, $search) = @_;
+    
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        search => $search,
+        );
+
+    to_template(\%vars, \$data->{'search_tags.tt'})
+}
+
+sub content_search_accounts
+{
+    my ($ssn, $data, $search) = @_;
+
+    search_page($ssn, $data, SEARCH_CAT_ACCOUNTS, search_accounts(@_)); 
+}
+
+sub content_search_statuses
 {
     my ($ssn, $data, $search) = @_;
 
@@ -55,10 +89,10 @@ sub search_statuses
         create_status => sub { generate_status($ssn, $data, shift); },
         );
 
-    search_page($ssn, $data, SEARCH_CAT_STATUSES, to_template(\%vars, \$data->{'search_statuses.tt'})); 
+    search_page($ssn, $data, SEARCH_CAT_STATUSES, search_statuses(@_)); 
 }
 
-sub search_tags
+sub content_search_tags
 {
     my ($ssn, $data, $tags) = @_;
 
@@ -68,7 +102,7 @@ sub search_tags
         tags => $tags,
         );
 
-    search_page($ssn, $data, SEARCH_CAT_TAGS, to_template(\%vars, \$data->{'search_tags.tt'})); 
+    search_page($ssn, $data, SEARCH_CAT_TAGS, search_tags(@_)); 
 }
 
 sub content_search
@@ -80,8 +114,9 @@ sub content_search
         ssn => $ssn,
         search => $search,
         
-        create_status => sub { generate_status($ssn, $data, shift); },
-        create_account => sub { generate_account_item($ssn, $data, shift); },
+        statuses => search_statuses,
+        accounts => search_accounts,
+        hashtags => search_tags,
         );
 
     to_template(\%vars, \$data->{'content_search.tt'});
diff --git a/src/search.c b/src/search.c
index 46a334d..5377e63 100644
--- a/src/search.c
+++ b/src/search.c
@@ -164,8 +164,7 @@ void content_search_statuses(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
-    
-    PERL_STACK_SCALAR_CALL("search::search_statuses");
+    PERL_STACK_SCALAR_CALL("search::content_search_statuses");
 
     // Duplicate so we can free the TMPs
     char* dup = PERL_GET_STACK_EXIT;
@@ -211,7 +210,7 @@ void content_search_accounts(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
     
-    PERL_STACK_SCALAR_CALL("search::search_accounts");
+    PERL_STACK_SCALAR_CALL("search::content_search_accounts");
 
     // Duplicate so we can free the TMPs
     char* dup = PERL_GET_STACK_EXIT;
diff --git a/templates/content_search.tt b/templates/content_search.tt
index e8312ff..f8a931f 100644
--- a/templates/content_search.tt
+++ b/templates/content_search.tt
@@ -19,20 +19,16 @@
 </table>
 
 <div class="search-results">
-    <input type="radio" class="search-page-hidden hidden" id="statuses-results-hidden" name="searchpage" checked>
+    <input type="radio" class="search-page-hidden hidden" id="statuses-results-hidden" name="searchpage"[% UNLESS search.statuses %] disabled[% ELSE %] checked[% END %]>
     <div class="statuses-results search-page">
-        [% FOREACH i IN search.statuses %]
-            [% create_status(i); %]
-        [% END %]
+        [% statuses %]
     </div>
-    <input type="radio" class="search-page-hidden hidden" id="accounts-results-hidden" name="searchpage">
+    <input type="radio" class="search-page-hidden hidden" id="accounts-results-hidden" name="searchpage"[% UNLESS search.accounts %] disabled[% END %]>
     <div class="accounts-results search-page">
-        [% FOREACH i IN search.accounts %]
-            [% create_account(i); %]
-        [% END %]        
+        [% accounts %]
     </div>
-    <input type="radio" class="search-page-hidden hidden" id="hashtags-results-hidden" name="searchpage">
+    <input type="radio" class="search-page-hidden hidden" id="hashtags-results-hidden" name="searchpage"[% UNLESS search.tags %] disabled[% END %]>
     <div class="hashtags-results search-page">
-        TODO
+        [% hashtags %]
     </div>
 </div>
diff --git a/templates/search.tt b/templates/search.tt
index c2250af..ece7d55 100644
--- a/templates/search.tt
+++ b/templates/search.tt
@@ -15,5 +15,5 @@
 </table>
 
 <div class="search-results">
-  [% results %]
+  [% content %]
 </div>
diff --git a/templates/search_statuses.tt b/templates/search_statuses.tt
index 24b4e1d..0b0ac8b 100644
--- a/templates/search_statuses.tt
+++ b/templates/search_statuses.tt
@@ -1,3 +1,4 @@
 [% FOREACH i IN search.statuses %]
     [% create_status(i); %]
 [% END %]
+

From d0989bed94699dbe711ca4928c65276d95dbc856 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 17:53:08 +0000
Subject: [PATCH 104/143] Fix function calls

FossilOrigin-Name: 1f071f17ed2014be4dda47899127a39749bc3c82397de6af94923100b40da822
---
 perl/search.pm | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/perl/search.pm b/perl/search.pm
index 61be55b..4c10d4f 100644
--- a/perl/search.pm
+++ b/perl/search.pm
@@ -39,6 +39,7 @@ sub search_accounts
         prefix => '',
         ssn => $ssn,
         search => $search,
+        create_account => sub { generate_account_item($ssn, $data, shift); },
         );
 
     to_template(\%vars, \$data->{'search_accounts.tt'})
@@ -52,6 +53,7 @@ sub search_statuses
         prefix => '',
         ssn => $ssn,
         search => $search,
+        create_status => sub { generate_status($ssn, $data, shift); },
         );
 
     to_template(\%vars, \$data->{'search_statuses.tt'})
@@ -72,37 +74,17 @@ sub search_tags
 
 sub content_search_accounts
 {
-    my ($ssn, $data, $search) = @_;
-
-    search_page($ssn, $data, SEARCH_CAT_ACCOUNTS, search_accounts(@_)); 
+    search_page($_[0], $_[1], SEARCH_CAT_ACCOUNTS, search_accounts(@_)); 
 }
 
 sub content_search_statuses
 {
-    my ($ssn, $data, $search) = @_;
-
-    my %vars = (
-        prefix => '',
-        ssn => $ssn,
-        search => $search,
-        
-        create_status => sub { generate_status($ssn, $data, shift); },
-        );
-
-    search_page($ssn, $data, SEARCH_CAT_STATUSES, search_statuses(@_)); 
+    search_page($_[0], $_[1], SEARCH_CAT_STATUSES, search_statuses(@_)); 
 }
 
 sub content_search_tags
 {
-    my ($ssn, $data, $tags) = @_;
-
-    my %vars = (
-        prefix => '',
-        ssn => $ssn,
-        tags => $tags,
-        );
-
-    search_page($ssn, $data, SEARCH_CAT_TAGS, search_tags(@_)); 
+    search_page($_[0], $_[1], SEARCH_CAT_TAGS, search_tags(@_)); 
 }
 
 sub content_search

From 549150504fd65f42ea371183be4b1c3127e523e1 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 19 Aug 2022 17:55:41 +0000
Subject: [PATCH 105/143] Fix

FossilOrigin-Name: 4c81ab29e0aee66ee0c8efd6cfd97c7f0858eccfe427187f950117b3ee73ab1c
---
 perl/search.pm              | 6 +++---
 templates/content_search.tt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/perl/search.pm b/perl/search.pm
index 4c10d4f..c480157 100644
--- a/perl/search.pm
+++ b/perl/search.pm
@@ -96,9 +96,9 @@ sub content_search
         ssn => $ssn,
         search => $search,
         
-        statuses => search_statuses,
-        accounts => search_accounts,
-        hashtags => search_tags,
+        statuses => search_statuses(@_),
+        accounts => search_accounts(@_),
+        hashtags => search_tags(@_),
         );
 
     to_template(\%vars, \$data->{'content_search.tt'});
diff --git a/templates/content_search.tt b/templates/content_search.tt
index f8a931f..71f4c40 100644
--- a/templates/content_search.tt
+++ b/templates/content_search.tt
@@ -27,7 +27,7 @@
     <div class="accounts-results search-page">
         [% accounts %]
     </div>
-    <input type="radio" class="search-page-hidden hidden" id="hashtags-results-hidden" name="searchpage"[% UNLESS search.tags %] disabled[% END %]>
+    <input type="radio" class="search-page-hidden hidden" id="hashtags-results-hidden" name="searchpage"[% UNLESS search.hashtags %] disabled[% END %]>
     <div class="hashtags-results search-page">
         [% hashtags %]
     </div>

From 8fae1ddfe96be52b2f15224bfa02543ae827fa78 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 20 Aug 2022 01:14:24 +0000
Subject: [PATCH 106/143] Remove test

FossilOrigin-Name: a4b205102959fc9c7c03b3aa2715b97d5bc856666be87f58a8e82ba8aa5426b1
---
 src/main.c |  2 --
 src/test.c | 80 ------------------------------------------------------
 src/test.h | 28 -------------------
 3 files changed, 110 deletions(-)
 delete mode 100644 src/test.c
 delete mode 100644 src/test.h

diff --git a/src/main.c b/src/main.c
index 1124eae..6f8cdb7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,7 +38,6 @@
 #include "timeline.h"
 #include "session.h"
 #include "notifications.h"
-#include "test.h"
 #include "env.h"
 #include "search.h"
 #include "about.h"
@@ -65,7 +64,6 @@ static struct path_info paths[] = {
     { "/config", content_config },
     { "/login/oauth", content_login_oauth },
     { "/login", content_login },
-    { "/test", content_test },
     { "/user/:/action/:", content_account_action },
     { "/user/:", content_account_statuses },
     { "/@:/scrobbles", content_account_scrobbles },
diff --git a/src/test.c b/src/test.c
deleted file mode 100644
index 433b90b..0000000
--- a/src/test.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "test.h"
-#include "../config.h"
-#include "base_page.h"
-#include "easprintf.h"
-
-// Pages
-#include "../static/test.ctmpl"
-
-#define ENV_NOT_FOUND "<span style=\"color:red;\">ENV Not Found</span>"
-
-enum env_tbl_index
-{
-    ENV_HTTP_COOKIE = 0,
-    ENV_PATH_INFO,
-    ENV_QUERY_STRING,
-    ENV_REQUEST_METHOD,
-    ENV_SCRIPT_NAME,
-    ENV_HTTP_REFERER,
-    ENV_HTTP_USER_AGENT,
-    ENV_CONTENT_LENGTH,
-};
-
-#define ENV_TBL_GET(index) (env_tbl[(index)] ? env_tbl[(index)] : ENV_NOT_FOUND)
-
-void content_test(PATH_ARGS)
-{
-    char* env_tbl[] = {
-        GET_ENV("HTTP_COOKIE", req),
-        GET_ENV("PATH_INFO", req),
-        GET_ENV("QUERY_STRING", req),
-        GET_ENV("REQUEST_METHOD", req),
-        GET_ENV("SCRIPT_NAME", req),
-        GET_ENV("HTTP_REFERER", req),
-        GET_ENV("HTTP_USER_AGENT", req),
-        GET_ENV("CONTENT_LENGTH", req)
-    };
-    
-    char* page;
-    struct test_template tdata = {
-        .HTTP_COOKIE = ENV_TBL_GET(ENV_HTTP_COOKIE),
-        .PATH_INFO = ENV_TBL_GET(ENV_PATH_INFO),
-        .QUERY_STRING = ENV_TBL_GET(ENV_QUERY_STRING),
-        .REQUEST_METHOD = ENV_TBL_GET(ENV_REQUEST_METHOD),
-        .SCRIPT_NAME = ENV_TBL_GET(ENV_SCRIPT_NAME),
-        .HTTP_REFERER = ENV_TBL_GET(ENV_HTTP_REFERER),
-        .HTTP_USER_AGENT = ENV_TBL_GET(ENV_HTTP_USER_AGENT),
-        .CONTENT_LENGTH = ENV_TBL_GET(ENV_CONTENT_LENGTH)
-    };
-    page = tmpl_gen_test(&tdata, NULL);
-    
-    struct base_page b = {
-        .category = BASE_CAT_NONE,
-        .content = page,
-        .sidebar_left = NULL
-    };
-
-    // Output
-    render_base_page(&b, req, ssn, api);
-    if (page) free(page);
-}
diff --git a/src/test.h b/src/test.h
deleted file mode 100644
index 3d82a19..0000000
--- a/src/test.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef TEST_H
-#define TEST_H
-#include <stddef.h>
-#include <mastodont.h>
-#include "session.h"
-#include "path.h"
-
-void content_test(PATH_ARGS);
-
-#endif /* TEST_H */

From bbdb95187b3f1d8ae3600ce6d87914bd2eb60b74 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 20 Aug 2022 02:26:41 +0000
Subject: [PATCH 107/143] Convert login page

FossilOrigin-Name: f61018fe4ab711036008fc1b24b27c4c1fa2fa249ee19932d943351f5a9dbc43
---
 perl/account.pm    |  1 -
 perl/login.pm      | 22 ++++++++++++++++++++++
 perl/main.pl       |  1 +
 src/global_perl.c  |  2 ++
 src/login.c        | 27 ++++++++++++---------------
 templates/login.tt | 29 +++++++++++++++++++++++++++++
 6 files changed, 66 insertions(+), 16 deletions(-)
 create mode 100644 perl/login.pm
 create mode 100644 templates/login.tt

diff --git a/perl/account.pm b/perl/account.pm
index 69d80a2..a9de118 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -1,7 +1,6 @@
 package account;
 use strict;
 use warnings;
-use Data::Dumper;
 
 use Exporter 'import';
 
diff --git a/perl/login.pm b/perl/login.pm
new file mode 100644
index 0000000..dbdfcfd
--- /dev/null
+++ b/perl/login.pm
@@ -0,0 +1,22 @@
+package login;
+use strict;
+use warnings;
+
+use Exporter 'import';
+
+our @EXPORT = qw( content_login );
+
+use template_helpers 'to_template';
+
+sub content_login
+{
+    my ($ssn, $data, $error) = @_;
+
+    my %vars = (
+        error => $error,
+        );
+    
+    to_template(\%vars, \$data->{'login.tt'});
+}
+
+1;
diff --git a/perl/main.pl b/perl/main.pl
index dc9ba54..66a3468 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -15,6 +15,7 @@ use chat;
 use config;
 use embed;
 use meta;
+use login;
 
 # my $template = Template->new(
 #     {
diff --git a/src/global_perl.c b/src/global_perl.c
index 5afae6a..e74e2a7 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -49,6 +49,7 @@
 #include "../templates/notifs_embed.ctt"
 #include "../templates/about.ctt"
 #include "../templates/license.ctt"
+#include "../templates/login.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -88,6 +89,7 @@ void init_template_files(pTHX)
     hv_stores(template_files, "notifs_embed.tt", newSVpv(data_notifs_embed_tt, data_notifs_embed_tt_size));
     hv_stores(template_files, "about.tt", newSVpv(data_about_tt, data_about_tt_size));
     hv_stores(template_files, "license.tt", newSVpv(data_license_tt, data_license_tt_size));
+    hv_stores(template_files, "login.tt", newSVpv(data_login_tt, data_login_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/login.c b/src/login.c
index 6fd8bfe..9a09c82 100644
--- a/src/login.c
+++ b/src/login.c
@@ -206,23 +206,21 @@ void content_login(PATH_ARGS)
         }
     }
 
-    // Concat
-    struct login_template tdata = {
-        .login_header = L10N[L10N_EN_US][L10N_LOGIN],
-        .error = error,
-        .prefix = config_url_prefix,
-        .username = L10N[L10N_EN_US][L10N_USERNAME],
-        .password = L10N[L10N_EN_US][L10N_PASSWORD],
-        .login_submit = L10N[L10N_EN_US][L10N_LOGIN_BTN],
-        .instance_text = "Or",
-        .instance_url = "Instance url",
-        .instance_submit = "Authorize"
-    };
-    page = tmpl_gen_login(&tdata, NULL);
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    if (storage.error || oauth_store.error)
+        XPUSHs(newSVpv(storage.error ? storage.error : oauth_store.error, 0));
+
+    PERL_STACK_SCALAR_CALL("login::content_login");
+
+    page = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
         .category = BASE_CAT_NONE,
         .content = page,
+        .session = session_hv,
         .sidebar_left = NULL
     };
 
@@ -232,6 +230,5 @@ void content_login(PATH_ARGS)
     // Cleanup
     mastodont_storage_cleanup(&storage);
     mastodont_storage_cleanup(&oauth_store);
-    if (error) free(error);
-    if (page) free(page);
+    Safefree(page);
 }
diff --git a/templates/login.tt b/templates/login.tt
new file mode 100644
index 0000000..ee04092
--- /dev/null
+++ b/templates/login.tt
@@ -0,0 +1,29 @@
+<div class="simple-page">
+    <h1>{{%s:login_header}}</h1>
+    
+    {{%s:error}}
+
+    <form action="/login" method="post">
+        <div class="form-group">
+            <label for="login-username">{{%s:username}}: </label>
+            <input type="text" id="login-username" name="username">
+        </div>
+        <div class="form-group">
+            <label for="login-password">{{%s:password}}: </label>
+            <input type="password" id="login-password" name="password"><br>
+        </div>
+        <div class="form-group">
+            <input class="btn" type="submit" value="{{%s:login_submit}}">
+        </div>
+    </form>
+
+    <h6>{{%s:instance_text}}</h6>
+
+    <form action="/login/oauth" method="post">
+        <div class="form-group">
+            <label for="instance-url">{{%s:instance_url}}: </label>
+            <input type="url" id="instance-url" name="instance">
+            <input class="btn" type="submit" value="{{%s:instance_submit}}">
+        </div>
+    </form>
+</div>

From 3b334562bf650320cb179bbce754ee53abf78e07 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 20 Aug 2022 02:43:17 +0000
Subject: [PATCH 108/143] Perlify status interactions

FossilOrigin-Name: de6177ca45c0d238fedbc8824f85220736453e0df45f3e2160ea6f027e763fae
---
 perl/account.pm                  | 20 +++++++++++++++++++-
 src/global_perl.c                |  2 ++
 src/status.c                     | 25 +++++++++++++------------
 templates/status_interactions.tt |  5 +++++
 4 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 templates/status_interactions.tt

diff --git a/perl/account.pm b/perl/account.pm
index a9de118..5c320e4 100644
--- a/perl/account.pm
+++ b/perl/account.pm
@@ -4,7 +4,7 @@ use warnings;
 
 use Exporter 'import';
 
-our @EXPORT = qw( account content_statuses generate_account_list generate_account_item );
+our @EXPORT = qw( account content_statuses generate_account_list generate_account_item status_interactions );
 
 use template_helpers 'to_template';
 use l10n 'lang';
@@ -81,6 +81,24 @@ sub generate_account_list
     to_template(\%vars, \$data->{'accounts.tt'});
 }
 
+sub status_interactions
+{
+    my ($ssn, $data, $accounts, $label) = @_;
+
+    my %vars = (
+        prefix => '',
+        ssn => $ssn,
+        data => $data,
+        accounts => $accounts,
+        label => $label,
+        # Functions
+        create_account => sub { generate_account_item($ssn, $data, shift); },
+        );
+
+
+    to_template(\%vars, \$data->{'status_interactions.tt'});
+}
+
 sub content_accounts
 {
     my ($ssn, $data, $acct, $relationship, $accounts, $title) = @_;
diff --git a/src/global_perl.c b/src/global_perl.c
index e74e2a7..d649478 100644
--- a/src/global_perl.c
+++ b/src/global_perl.c
@@ -50,6 +50,7 @@
 #include "../templates/about.ctt"
 #include "../templates/license.ctt"
 #include "../templates/login.ctt"
+#include "../templates/status_interactions.ctt"
 
 PerlInterpreter* my_perl;
 HV* template_files;
@@ -90,6 +91,7 @@ void init_template_files(pTHX)
     hv_stores(template_files, "about.tt", newSVpv(data_about_tt, data_about_tt_size));
     hv_stores(template_files, "license.tt", newSVpv(data_license_tt, data_license_tt_size));
     hv_stores(template_files, "login.tt", newSVpv(data_login_tt, data_login_tt_size));
+    hv_stores(template_files, "status_interactions.tt", newSVpv(data_status_interactions_tt, data_status_interactions_tt_size));
 }
 
 void cleanup_template_files()
diff --git a/src/status.c b/src/status.c
index 97ba905..a4890ec 100644
--- a/src/status.c
+++ b/src/status.c
@@ -898,28 +898,29 @@ void content_status_interactions(FCGX_Request* req,
                                  struct mstdnt_account* accts,
                                  size_t accts_len)
 {
-    char* accounts_html = construct_accounts(api, accts, accts_len, 0, NULL);
-    if (!accounts_html)
-        accounts_html = construct_error("No accounts", E_NOTICE, 1, NULL);
+    PERL_STACK_INIT;
+    HV* session_hv = perlify_session(ssn);
+    XPUSHs(newRV_noinc((SV*)session_hv));
+    XPUSHs(newRV_noinc((SV*)template_files));
+    if (accts)
+        XPUSHs(newRV_noinc((SV*)perlify_accounts(accts, accts_len)));
+    else ARG_UNDEFINED();
+    XPUSHs(newSVpv(label, 0));
 
-    struct interactions_page_template tmpl = {
-        .back_ref = GET_ENV("HTTP_REFERER", req),
-        .interaction_str = label,
-        .accts = accounts_html
-    };
+    PERL_STACK_SCALAR_CALL("account::status_interactions");
 
-    char* output = tmpl_gen_interactions_page(&tmpl, NULL);
+    char* dup = PERL_GET_STACK_EXIT;
 
     struct base_page page = {
         .category = BASE_CAT_NONE,
-        .content = output,
+        .content = dup,
+        .session = session_hv,
         .sidebar_left = NULL
     };
     render_base_page(&page, req, ssn, api);
 
     // Cleanup
-    free(accounts_html);
-    free(output);
+    Safefree(dup);
 }
 
 void content_status(PATH_ARGS, uint8_t flags)
diff --git a/templates/status_interactions.tt b/templates/status_interactions.tt
new file mode 100644
index 0000000..663fb07
--- /dev/null
+++ b/templates/status_interactions.tt
@@ -0,0 +1,5 @@
+<h1 class="text-header">$label</h1>
+
+[% FOREACH i IN accounts %]
+    [% create_account(i) %]
+[% END %]

From aae83c2bd9c7ae3ba0dfb432d2b64041af4ed087 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 20 Aug 2022 02:50:31 +0000
Subject: [PATCH 109/143] Cleanup old template shit, good riddance

FossilOrigin-Name: 555fc3773213a18194ffb772aec29855553275a997e38962627f328d5457e9b8
---
 Makefile                               |  29 ---
 src/template/main.c                    | 295 -------------------------
 static/about.tmpl                      |  28 ---
 static/account.tmpl                    |  67 ------
 static/account_current_menubar.tmpl    |   7 -
 static/account_follow_btn.tmpl         |   3 -
 static/account_info.tmpl               |   3 -
 static/account_sidebar.tmpl            |  36 ---
 static/account_stub.tmpl               |  19 --
 static/attachment_audio.tmpl           |   7 -
 static/attachment_gifv.tmpl            |   7 -
 static/attachment_image.tmpl           |   4 -
 static/attachment_link.tmpl            |   3 -
 static/attachment_video.tmpl           |   7 -
 static/attachments.tmpl                |   3 -
 static/bar.tmpl                        |   3 -
 static/bar_graph.tmpl                  |   3 -
 static/basic_page.tmpl                 |   4 -
 static/bookmarks_page.tmpl             |   7 -
 static/chat.tmpl                       |  19 --
 static/chat_view.tmpl                  |  21 --
 static/chats_page.tmpl                 |   1 -
 static/config_appearance.tmpl          |  42 ----
 static/config_general.tmpl             |  94 --------
 static/config_sidebar.tmpl             |   5 -
 static/contact.tmpl                    |  19 --
 static/custom_emoji_reaction.tmpl      |   1 -
 static/directs_page.tmpl               |   6 -
 static/embed.tmpl                      |  21 --
 static/emoji.tmpl                      |   1 -
 static/emoji_picker.tmpl               |  81 -------
 static/emoji_plain.tmpl                |   1 -
 static/emoji_reaction.tmpl             |   1 -
 static/emoji_reactions.tmpl            |   3 -
 static/error.tmpl                      |   1 -
 static/error_404.tmpl                  |   4 -
 static/expand_btn.tmpl                 |   1 -
 static/expand_btn_img.tmpl             |   1 -
 static/favourites_page.tmpl            |   7 -
 static/follow_svg.tmpl                 |   1 -
 static/hashtag.tmpl                    |   1 -
 static/hashtag_page.tmpl               |   7 -
 static/in_reply_to.tmpl                |   3 -
 static/index.tmpl                      |  87 --------
 static/instance.tmpl                   |   1 -
 static/interaction_buttons.tmpl        |  39 ----
 static/interactions_page.tmpl          |   4 -
 static/license.tmpl                    |   0
 static/like_btn.tmpl                   |   2 -
 static/like_btn_img.tmpl               |   1 -
 static/like_svg.tmpl                   |   1 -
 static/likeboost.tmpl                  |   9 -
 static/list.tmpl                       |  15 --
 static/list_edit.tmpl                  |   1 -
 static/lists.tmpl                      |  17 --
 static/login.tmpl                      |  29 ---
 static/menu_item.tmpl                  |   6 -
 static/message.tmpl                    |  10 -
 static/navigation.tmpl                 |  32 ---
 static/notification.tmpl               |  10 -
 static/notification_action.tmpl        |  25 ---
 static/notification_compact.tmpl       |  17 --
 static/notifications.tmpl              |   3 -
 static/notifications_embed.tmpl        |  25 ---
 static/notifications_page.tmpl         |   7 -
 static/post.tmpl                       |  64 ------
 static/quick_login.tmpl                |  15 --
 static/reactions_btn.tmpl              |   7 -
 static/repeat_btn.tmpl                 |   2 -
 static/repeat_btn_img.tmpl             |   1 -
 static/repeat_svg.tmpl                 |   1 -
 static/reply_btn.tmpl                  |   2 -
 static/reply_btn_img.tmpl              |   1 -
 static/reply_checkbox.tmpl             |   0
 static/reply_link.tmpl                 |   5 -
 static/scrobble.tmpl                   |  28 ---
 static/search.tmpl                     |  17 --
 static/search_all.tmpl                 |  34 ---
 static/status.tmpl                     |  54 -----
 static/status_interaction_profile.tmpl |   1 -
 static/status_interactions.tmpl        |  11 -
 static/status_interactions_label.tmpl  |   4 -
 static/test.tmpl                       |  52 -----
 static/thread_page_btn.tmpl            |  16 --
 static/timeline_options.tmpl           |  14 --
 85 files changed, 1547 deletions(-)
 delete mode 100644 src/template/main.c
 delete mode 100644 static/about.tmpl
 delete mode 100644 static/account.tmpl
 delete mode 100644 static/account_current_menubar.tmpl
 delete mode 100644 static/account_follow_btn.tmpl
 delete mode 100644 static/account_info.tmpl
 delete mode 100644 static/account_sidebar.tmpl
 delete mode 100644 static/account_stub.tmpl
 delete mode 100644 static/attachment_audio.tmpl
 delete mode 100644 static/attachment_gifv.tmpl
 delete mode 100644 static/attachment_image.tmpl
 delete mode 100644 static/attachment_link.tmpl
 delete mode 100644 static/attachment_video.tmpl
 delete mode 100644 static/attachments.tmpl
 delete mode 100644 static/bar.tmpl
 delete mode 100644 static/bar_graph.tmpl
 delete mode 100644 static/basic_page.tmpl
 delete mode 100644 static/bookmarks_page.tmpl
 delete mode 100644 static/chat.tmpl
 delete mode 100644 static/chat_view.tmpl
 delete mode 100644 static/chats_page.tmpl
 delete mode 100644 static/config_appearance.tmpl
 delete mode 100644 static/config_general.tmpl
 delete mode 100644 static/config_sidebar.tmpl
 delete mode 100644 static/contact.tmpl
 delete mode 100644 static/custom_emoji_reaction.tmpl
 delete mode 100644 static/directs_page.tmpl
 delete mode 100644 static/embed.tmpl
 delete mode 100644 static/emoji.tmpl
 delete mode 100644 static/emoji_picker.tmpl
 delete mode 100644 static/emoji_plain.tmpl
 delete mode 100644 static/emoji_reaction.tmpl
 delete mode 100644 static/emoji_reactions.tmpl
 delete mode 100644 static/error.tmpl
 delete mode 100644 static/error_404.tmpl
 delete mode 100644 static/expand_btn.tmpl
 delete mode 100644 static/expand_btn_img.tmpl
 delete mode 100644 static/favourites_page.tmpl
 delete mode 100644 static/follow_svg.tmpl
 delete mode 100644 static/hashtag.tmpl
 delete mode 100644 static/hashtag_page.tmpl
 delete mode 100644 static/in_reply_to.tmpl
 delete mode 100644 static/index.tmpl
 delete mode 100644 static/instance.tmpl
 delete mode 100644 static/interaction_buttons.tmpl
 delete mode 100644 static/interactions_page.tmpl
 delete mode 100644 static/license.tmpl
 delete mode 100644 static/like_btn.tmpl
 delete mode 100644 static/like_btn_img.tmpl
 delete mode 100644 static/like_svg.tmpl
 delete mode 100644 static/likeboost.tmpl
 delete mode 100644 static/list.tmpl
 delete mode 100644 static/list_edit.tmpl
 delete mode 100644 static/lists.tmpl
 delete mode 100644 static/login.tmpl
 delete mode 100644 static/menu_item.tmpl
 delete mode 100644 static/message.tmpl
 delete mode 100644 static/navigation.tmpl
 delete mode 100644 static/notification.tmpl
 delete mode 100644 static/notification_action.tmpl
 delete mode 100644 static/notification_compact.tmpl
 delete mode 100644 static/notifications.tmpl
 delete mode 100644 static/notifications_embed.tmpl
 delete mode 100644 static/notifications_page.tmpl
 delete mode 100644 static/post.tmpl
 delete mode 100644 static/quick_login.tmpl
 delete mode 100644 static/reactions_btn.tmpl
 delete mode 100644 static/repeat_btn.tmpl
 delete mode 100644 static/repeat_btn_img.tmpl
 delete mode 100644 static/repeat_svg.tmpl
 delete mode 100644 static/reply_btn.tmpl
 delete mode 100644 static/reply_btn_img.tmpl
 delete mode 100644 static/reply_checkbox.tmpl
 delete mode 100644 static/reply_link.tmpl
 delete mode 100644 static/scrobble.tmpl
 delete mode 100644 static/search.tmpl
 delete mode 100644 static/search_all.tmpl
 delete mode 100644 static/status.tmpl
 delete mode 100644 static/status_interaction_profile.tmpl
 delete mode 100644 static/status_interactions.tmpl
 delete mode 100644 static/status_interactions_label.tmpl
 delete mode 100644 static/test.tmpl
 delete mode 100644 static/thread_page_btn.tmpl
 delete mode 100644 static/timeline_options.tmpl

diff --git a/Makefile b/Makefile
index 3bf0aa3..8157407 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,6 @@ SRC = $(wildcard src/*.c)
 OBJ = $(patsubst %.c,%.o,$(SRC))
 HEADERS = $(wildcard src/*.h) config.h
 PAGES_DIR = static
-TMPL_DIR = templates
-PAGES = $(wildcard $(PAGES_DIR)/*.tmpl)
-TMPLS = $(wildcard $(TMPL_DIR)/*.tt)
-PAGES_CMP = $(patsubst %.tmpl,%.ctmpl,$(PAGES))
-PAGES_C = $(patsubst %.tmpl, %.c,$(PAGES))
-PAGES_C_OBJ = $(patsubst %.c,%.o,$(PAGES_C))
-TMPLS_C = $(patsubst %.tt,%.ctt,$(TMPLS))
 TEST_DIR = test/unit
 TESTS = $(wildcard $(TEST_DIR)/t*.c)
 UNIT_TESTS = $(patsubst %.c,%.bin,$(TESTS))
@@ -32,21 +25,11 @@ MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 all:
 	$(MAKE) dep_build
 	$(MAKE) filec
-	$(MAKE) ctemplate
-	$(MAKE) make_ctmpls
-	$(MAKE) make_pages
-	$(MAKE) make_pagesc
-	$(MAKE) make_pagescobj
 	$(MAKE) $(TARGET)
 
 install_deps:
 	cpan Template::Toolkit
 
-make_ctmpls: $(TMPLS_C)
-make_pages: $(PAGES_CMP)
-make_pagesc: $(PAGES_C)
-make_pagescobj: $(PAGES_C_OBJ)
-
 $(TARGET): $(HEADERS) $(OBJ)
 	$(CC) -o $(TARGET) $(OBJ) $(PAGES_C_OBJ) $(LDFLAGS)
 
@@ -57,17 +40,6 @@ emojitoc: scripts/emoji-to.o
 	$(CC) -o emojitoc $< $(LDFLAGS)
 	./emojitoc meta/emoji.json > src/emoji_codes.h
 
-# Redirect stdout and stderr into separate contents as a hack
-# Let bash do the work :)
-$(PAGES_DIR)/%.ctmpl: $(PAGES_DIR)/%.tmpl $(TMPLS)
-	./ctemplate $< $(notdir $*) 2> $(PAGES_DIR)/$(notdir $*).c 1> $@
-
-$(TMPL_DIR)/%.ctt: $(TMPL_DIR)/%.tt
-	./filec $< data_$(notdir $*)_tt > $@
-
-ctemplate: src/template/main.o
-	$(CC) $(LDFLAGS) -o ctemplate $<
-
 $(MASTODONT_DIR): 
 	cd ..; fossil clone $(MASTODONT_URL) || true
 	cd treebird; ln -s ../mastodont-c .
@@ -95,7 +67,6 @@ dep_build:
 clean:
 	rm -f $(OBJ) src/file-to-c/main.o
 	rm -f $(PAGES_CMP)
-	rm -f $(TMPLS_C)
 	rm -f test/unit/*.bin
 	rm -f filec ctemplate
 	rm $(TARGET) || true
diff --git a/src/template/main.c b/src/template/main.c
deleted file mode 100644
index 97219bc..0000000
--- a/src/template/main.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-// TODO error handling
-
-enum args
-{
-    ARG_FILENAME = 1,
-    ARG_VARIABLE
-};
-
-enum tmpl_type
-{
-    TMPL_INT,
-    TMPL_UINT,
-    TMPL_STR,
-    TMPL_STRLEN,
-    TMPL_FLOAT,
-};
-
-struct tmpl_token
-{
-    enum tmpl_type type;
-    char* token;
-    int used; // Internal use only
-};
-
-long filesize(FILE* file)
-{
-    long orig = ftell(file);
-    fseek(file, 0, SEEK_END);
-    long size = ftell(file);
-    fseek(file, orig, SEEK_SET);
-    return size;
-}
-
-void chexput(const char* buf, size_t size)
-{
-    for (size_t i = 0; i < size && buf; ++i)
-    {
-        printf("0X%hhX,", buf[i]);
-    }
-}
-
-char* strnws(char* str)
-{
-    for (; isblank(*str); ++str);
-    return str;
-}
-
-char* strwsc(char* str, char stop)
-{
-    for (; !isblank(*str) && *str != stop; ++str);
-    return str;
-}
-
-char* tkn_typetostr(enum tmpl_type tkn)
-{
-    switch (tkn)
-    {
-    case TMPL_INT:
-        return "int";
-    case TMPL_STR:
-        return "const char*";
-    case TMPL_STRLEN:
-        return "char*";
-    case TMPL_UINT:
-        return "unsigned";
-    case TMPL_FLOAT:
-        return "float";
-    }
-    return "";
-}
-
-enum tmpl_type tkn_type(char* str)
-{
-    if (strcmp(str, "string") == 0 ||
-        strcmp(str, "str") == 0 ||
-        strcmp(str, "%s") == 0)
-        return TMPL_STR;
-    else if (strcmp(str, "stringlen") == 0 ||
-             strcmp(str, "strlen") == 0 ||
-             strcmp(str, "%.s") == 0)
-        return TMPL_STRLEN;
-    else if (strcmp(str, "int") == 0 ||
-             strcmp(str, "i") == 0 ||
-             strcmp(str, "%d") == 0)
-        return TMPL_INT;
-    else if (strcmp(str, "unsigned") == 0 ||
-             strcmp(str, "uint") == 0 ||
-             strcmp(str, "%u") == 0)
-        return TMPL_UINT;
-    else if (strcmp(str, "float") == 0 ||
-             strcmp(str, "%f") == 0)
-        return TMPL_FLOAT;
-
-    // TODO Real error handling
-    return TMPL_INT;
-}
-
-char* parse_tmpl_token(char* buf, struct tmpl_token* tkn)
-{
-    tkn->used = 0;
-    char* type_begin;
-    char* type_end;
-    char* tkn_begin;
-    char* tkn_end;
-    // skip {{
-    buf += 2;
-    type_begin = strnws(buf);
-    type_end = strwsc(type_begin, ':');
-    
-    if (*type_end != ':') buf = strchr(buf, ':');
-    else buf = type_end;
-    
-    *type_end = '\0';
-    tkn->type = tkn_type(type_begin);
-
-    ++buf;
-    tkn_begin = strnws(buf);
-    tkn_end = strwsc(tkn_begin, '}');
-    
-    if (*tkn_end == '}') buf = tkn_end + 2;
-    else buf = strstr(buf, "}}") + 2;
-
-    *tkn_end = '\0';
-    tkn->token = tkn_begin;
-    return buf;
-}
-
-void print_template(char* var, char* buf)
-{
-    char* buf_prev = buf;
-    char* buf_curr = buf;
-    // Store result
-    struct tmpl_token* tokens = NULL;
-    size_t tokens_len = 0;
-    
-    printf("#ifndef __%s\n"
-           "#define __%s\n"
-           "#include <stddef.h>\n"
-           "static const char data_%s[] = {", var, var, var);
-    
-    while (1)
-    {
-        buf_curr = strstr(buf_curr, "{{");
-        if (!buf_curr) break;
-        // Create tokens array
-        tokens = realloc(tokens, sizeof(struct tmpl_token) * ++tokens_len);
-        if (!tokens)
-        {
-            perror("realloc");
-            break;
-        }
-        // Print up to this point
-        chexput(buf_prev, buf_curr - buf_prev);
-        buf_prev = buf_curr = parse_tmpl_token(buf_curr, tokens + (tokens_len-1));
-
-        // Print type
-        switch (tokens[tokens_len-1].type)
-        {
-        case TMPL_INT:
-            // I'm lazy so we'll use this
-            chexput("%d", 2);
-            break;
-        case TMPL_STR:
-            chexput("%s", 2);
-            break;
-        case TMPL_STRLEN:
-            chexput("%.s", 3);
-            break;
-        case TMPL_UINT:
-            chexput("%u", 2);
-            break;
-        case TMPL_FLOAT:
-            chexput("%f", 2);
-            break;
-        }
-    }
-
-    // Print remainder if any
-    chexput(buf_prev, strlen(buf_prev));
-    puts("0};");
-
-    // Only create struct and function when there are tokens detected
-    if (tokens_len)
-    {
-        printf("struct %s_template {", var);
-
-        int should_print = 0;
-        // Print tokens
-        for (size_t i = 0; i < tokens_len; ++i)
-        {
-            should_print = 1;
-            // Check if used
-            for (size_t j = 0; j < tokens_len; ++j)
-            {
-                if (i != j &&
-                    strcmp(tokens[i].token, tokens[j].token) == 0 &&
-                    tokens[j].used)
-                    should_print = 0;
-            }
-            if (should_print)
-            {
-                printf("%s %s;\n", tkn_typetostr(tokens[i].type), tokens[i].token);
-                if (tokens[i].type == TMPL_STRLEN)
-                    printf("size_t %s_len;\n", tokens[i].token);
-                tokens[i].used = 1;
-            }
-        }
-
-        // Generate function
-        printf("};\n");
-        printf("char* tmpl_gen_%s(struct %s_template* data, size_t* size);", var, var);
-
-        // Pipe the contents of the real function code into stderr, then we can redirect it
-        // We could also just write the file directly but this works better with the Makefile
-        // and I am lazy
-        fprintf(stderr, "#include \"%s.ctmpl\"\n"
-                "#include \"../src/easprintf.h\"\n"
-                "char* tmpl_gen_%s(struct %s_template* data, size_t* size){\n"
-                "char* ret;\n"
-                "size_t s = easprintf(&ret, data_%s, ", var, var, var, var);
-        for (size_t i = 0; i < tokens_len; ++i)
-        {
-            fprintf(stderr, "data->%s", tokens[i].token);
-            // No (null) strings, make them empty
-            if (tokens[i].type == TMPL_STR || tokens[i].type == TMPL_STRLEN)
-                fprintf(stderr, "?data->%s:\"\"", tokens[i].token);
-            fputs(i < tokens_len-1 ? ", " : "", stderr);
-        }
-        fputs(");\n"
-              "if (size) *size = s;\n"
-              "return ret;\n}", stderr);
-    }
-
-    // Done!
-    puts("\n#endif");
-    // Cleanup
-    free(tokens);
-}
-
-int main(int argc, char** argv)
-{
-    char* buf;
-    FILE* file = fopen(argv[ARG_FILENAME], "rb");
-
-    long size = filesize(file);
-
-    if (!(buf = malloc(size)))
-    {
-        perror("malloc");
-        return 1;
-    }
-
-    if (fread(buf, 1, size, file) != size)
-    {
-        fputs("Didn't read correctly!", stderr);
-        free(buf);
-        return 1;
-    }
-
-    fclose(file);
-    buf[size-1] = '\0';
-
-    print_template(argv[ARG_VARIABLE], buf);
-
-
-
-    
-    free(buf);
-    return 0;
-}
- 
diff --git a/static/about.tmpl b/static/about.tmpl
deleted file mode 100644
index 244c51d..0000000
--- a/static/about.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="simple-page">
-  <div class="about-header">
-    <h1><img id="about-icon" src="/treebird_logo.png"> <span>Treebird</span></h1>
-  </div>
-  <div class="about-content">
-    <p>Treebird is a Pleroma frontend that is lightweight, efficient, and true to the web. It's written in C with FCGI making it simple and fast to work with and deploy. It is very tight to the philosophy of how the internet has always worked; Javascript provides extra sugar (or scripting) to improve the experience but not a requirement, while still being simple enough that anyone can use it.</p>
-
-    <p>Treebird was created in response to PleromaFE performance issues and ironically a lack of PleromaAPI backend support. Treebird resembles GNU Social in appearance by default, but keeps the familiarity that many are used to of PleromaFE.</p>
-
-    <p>Treebird was created by <a href="/@nekobit@rdrama.cc">Nekobit</a>, who created <a href="https://fossil.nekobit.net/mastodont-c/home">mastodont-c</a>, a library that can communicate with Revolver's, Pleroma's, and Mastodon's REST APIs.</p>
-
-    <h3>Other contributors</h3>
-    <ul>
-      <li><a href="/@coyote@pl.lain.sh" alt="Created Solarized themes for Treebird">Coyote</a></li>
-      <li><a href="/@grumbulon@freecumextremist.com" alt="Helped with the original dark theme, and created the original treebird.dev website">Grumbulon</a></li>
-      <li><a href="/@khan@sleepy.cafe" alt="Started idea of treebird">Khan</a></li>
-      <li><a href="/@sam@froth.zone" alt="Testing with Nginx and documentation">SamTherapy</a></li>
-      <li><a href="/@pch_xyz@seediqbale.xyz" alt="Chinese (Traditional) translations">Pacific Coast Highway (pch_xyz)</a></li>
-    </ul>
-
-    <p>Treebird is licensed in AGPLv3, and mastodont-c is LGPLv3 licensed. Other licenses apply to libraries as well. <a href="/about/license">View the AGPLv3 license here.</a></p>
-
-    <a class="btn btn-single" href="https://fossil.nekobit.net/treebird/home">View the Fossil Repository</a> <a class="btn btn-single" href="/about/license">View the License</a>
-  </div>
-</div>
-
-<!-- Scripts -->
-<script src="/js/worm.js"></script>
\ No newline at end of file
diff --git a/static/account.tmpl b/static/account.tmpl
deleted file mode 100644
index aad5b62..0000000
--- a/static/account.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{{%s:is_blocked}}
-{{%s:menubar}}
-<div class="account">
-  <div class="acct-banner" style="background-image:url('{{%s:header}}');">
-    {{%s:follows_you}}
-    <div class="acct-info-data">
-      <span class="acct-displayname">{{%s:display_name}}</span>
-      <span class="acct-username">{{%s:acct}}</span>
-    </div>
-
-    <span class="menu-container user-options-btn">
-      Menu
-      <div class="menu menu-options">
-        <ul>
-          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unsubscribe}}subscribe"><input class="btn-menu" type="button" value="{{%s:subscribe_text}}"></a></li>
-          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unblock}}block"><input class="btn-menu" type="button" value="{{%s:block_text}}"></a></li>
-          <li><a class="nolink" href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unmute}}mute"><input class="btn-menu" type="button" value="{{%s:mute_text}}"></a></li>
-        </ul>
-      </div>
-    </span>
-  </div>
-  
-  <div class="acct-header">
-    <a href="{{%s:prefix}}/@{{%s:acct}}" class="header-btn btn">
-      <span class="btn-header">{{%s:tab_statuses_text}}</span>
-      <span class="btn-content">{{%d:statuses_count}}</span>
-    </a>
-    
-    <a href="{{%s:prefix}}/@{{%s:acct}}/following" class="header-btn btn">
-      <span class="btn-header">{{%s:tab_following_text}}</span>
-      <span class="btn-content">{{%d:following_count}}</span>
-    </a>
-
-    <a href="{{%s:prefix}}/@{{%s:acct}}/followers" class="header-btn btn">
-      <span class="btn-header">{{%s:tab_followers_text}}</span>
-      <span class="btn-content">{{%d:followers_count}}</span>
-    </a>
-    
-    {{%s:follow_btn}}
-  </div>
-  <div class="acct-pfp-wrapper">
-    <img class="acct-pfp" src="{{%s:avatar}}">
-  </div>
-</div>
-
-{{%s:info}}
-
-<table class="tabs ui-table">
-  <tr>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/statuses"><input class="tab-btn btn {{%s:tab_statuses_focused}}" type="button" value="{{%s:tab_statuses_text}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/scrobbles"><input class="tab-btn btn {{%s:tab_scrobbles_focused}}" type="button" value="{{%s:tab_scrobbles_text}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/media"><input class="tab-btn btn {{%s:tab_media_focused}}" type="button" value="{{%s:tab_media_text}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}/pinned"><input class="tab-btn btn {{%s:tab_pinned_focused}}" type="button" value="{{%s:tab_pinned_text}}"></a>
-    </td>
-  </tr>
-</table>
-
-<div class="account-content">
-  {{%s:acct_content}}
-</div>
diff --git a/static/account_current_menubar.tmpl b/static/account_current_menubar.tmpl
deleted file mode 100644
index 5ff4be2..0000000
--- a/static/account_current_menubar.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="menubar">
-  <a href="{{%s:prefix}}/blocked">{{ %s : blocked_str }}</a>
-  <span class="bullet-separate">&bull;</span>
-  <a href="{{%s:prefix}}/muted">{{ %s : muted_str }}</a>
-  <span class="bullet-separate">&bull;</span>
-  <a href="{{%s:prefix}}/favourites">{{ %s : favourited_str }}</a>
-</div>
diff --git a/static/account_follow_btn.tmpl b/static/account_follow_btn.tmpl
deleted file mode 100644
index 6157957..0000000
--- a/static/account_follow_btn.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="{{%s:prefix}}/user/{{%s:userid}}/action/{{%s:unfollow}}follow" class="follow-btn btn {{%s:active}}">
-  {{%s:follow_text}}
-</a>
diff --git a/static/account_info.tmpl b/static/account_info.tmpl
deleted file mode 100644
index e03edf7..0000000
--- a/static/account_info.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="account-info">
-  <div class="account-note">{{%s:acct_note}}</div>
-</div>
diff --git a/static/account_sidebar.tmpl b/static/account_sidebar.tmpl
deleted file mode 100644
index 278a61b..0000000
--- a/static/account_sidebar.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="account-sidebar" {{ %s : header }}>
-  <table class="acct-info">
-    <tr>
-      <td>
-        <img src="{{%s:avatar}}" class="acct-pfp" loading="lazy">
-      </td>
-      <td class="acct-info-right">
-        <span class="username">{{%s:username}}</span>
-        <span class="acct">@<span class="acct-js-grep">{{%s:acct}}</span></span>
-      </td>
-    </tr>
-  </table>
-  <table class="acct-stats">
-    <tr>
-      <td class="header-btn btn">
-        <a href="{{%s:prefix}}/@{{%s:acct}}">
-          <span class="btn-header">{{%s:statuses_text}}</span>
-          <span class="btn-content">{{%d:statuses_count}}</span>
-        </a>
-      </td>
-      <td class="header-btn btn">
-        <a href="{{%s:prefix}}/@{{%s:acct}}/following">
-          <span class="btn-header">{{%s:following_text}}</span>
-          <span class="btn-content">{{%d:following_count}}</span>
-        </a>
-      </td>
-      <td class="header-btn btn">
-        <a href="{{%s:prefix}}/@{{%s:acct}}/followers">
-          <span class="btn-header">{{%s:followers_text}}</span>
-          <span class="btn-content">{{%d:followers_count}}</span>
-        </a>
-      </td>
-    </tr>
-  </table>
-</div>
-
diff --git a/static/account_stub.tmpl b/static/account_stub.tmpl
deleted file mode 100644
index 0588754..0000000
--- a/static/account_stub.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<table class="account-stub">
-  <tr>
-    <td class="pfp-td">
-      <a href="{{%s:prefix}}/@{{%s:acct}}"><img src="{{%s:avatar}}"></a>
-    </td>
-    <td class="account-stub-info-wrapper">
-      <div class="account-stub-info">
-        <a href="{{%s:prefix}}/@{{%s:acct}}">
-          <div class="account-stub-top">
-            <span class="username">{{%s:display_name}}</span>
-          </div>
-          <div class="account-stub-bottom">
-            <span class="instance-info">@{{%s:acct}}</span>
-          </div>
-        </a>
-      </div>
-    </td>
-  </tr>
-</table>
diff --git a/static/attachment_audio.tmpl b/static/attachment_audio.tmpl
deleted file mode 100644
index 3f63b21..0000000
--- a/static/attachment_audio.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="attachment-container attachment-audio">
-  <!-- Here even if not sensitive -->
-  <div class="sensitive-placeholder {{%s:sensitive}}"></div>
-  <audio width="256" controls preload="metadata">
-    <source src="{{%s:src}}">
-  </video>
-</div>
diff --git a/static/attachment_gifv.tmpl b/static/attachment_gifv.tmpl
deleted file mode 100644
index 0dc17c8..0000000
--- a/static/attachment_gifv.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="attachment-container attachment-gifv">
-  <video width="256" autoplay muted>
-    <source src="{{%s:src}}">
-    [ GIFV ]
-  </video>
-  {{%s:sensitive}}
-</div>
diff --git a/static/attachment_image.tmpl b/static/attachment_image.tmpl
deleted file mode 100644
index ec75542..0000000
--- a/static/attachment_image.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="attachment-container attachment-img">
-  <img width="256" src="{{%s:src}}" loading="lazy">
-  {{%s:sensitive}}
-</div>
diff --git a/static/attachment_link.tmpl b/static/attachment_link.tmpl
deleted file mode 100644
index 83dc9fd..0000000
--- a/static/attachment_link.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="attachment-container attachment-link {{%s:sensitive}}">
-  <a href="{{%s:url}}">Attachment</a>
-</div>
diff --git a/static/attachment_video.tmpl b/static/attachment_video.tmpl
deleted file mode 100644
index 254e90d..0000000
--- a/static/attachment_video.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="attachment-container attachment-video">
-  <video width="256" controls preload="metadata">
-    <source src="{{%s:src}}">
-    [ VIDEO ]
-  </video>
-  {{%s:sensitive}}
-</div>
diff --git a/static/attachments.tmpl b/static/attachments.tmpl
deleted file mode 100644
index 9879028..0000000
--- a/static/attachments.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="attachments">
-  {{%s:attachments}}
-</div>
diff --git a/static/bar.tmpl b/static/bar.tmpl
deleted file mode 100644
index c3eceda..0000000
--- a/static/bar.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="bar">
-  <div style="max-height: {{%f:value}}%%;"></div>
-</div>
diff --git a/static/bar_graph.tmpl b/static/bar_graph.tmpl
deleted file mode 100644
index 83cd3f6..0000000
--- a/static/bar_graph.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="bar-graph">
-  {{%s:graph}}
-</div>
diff --git a/static/basic_page.tmpl b/static/basic_page.tmpl
deleted file mode 100644
index d7f455b..0000000
--- a/static/basic_page.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="simple-page">
-    <h1><a href="{{ %s : back_ref }}" class="page-back-btn">&lt;</a> {{ %s : page_title }}</h1>
-</div>
-{{%s : page_content}}
diff --git a/static/bookmarks_page.tmpl b/static/bookmarks_page.tmpl
deleted file mode 100644
index 0e34b35..0000000
--- a/static/bookmarks_page.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="simple-page">
-  <h1>Bookmarks</h1>
-</div>
-<div class="bookmarks-container">
-  {{%s:statuses}}
-</div>
-{{%s:navigation}}
diff --git a/static/chat.tmpl b/static/chat.tmpl
deleted file mode 100644
index c5680cb..0000000
--- a/static/chat.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<a href="{{%s:prefix}}/chats/{{%s:id}}#{{%s:message_id}}">
-  <table class="contact">
-    <tr>
-      <td class="pfp-td">
-        <img src="{{%s:avatar}}">
-      </td>
-      <td class="contact-right-td">
-        <div class="contact-right">
-          <div class="contact-info">
-            <span class="username" title="{{%s:acct}}">{{%s:display_name}}</span>
-          </div>
-          <div class="last-message">
-            <span class="chat-msg-preview">{{ %s : last_message }}</span>
-          </div>
-        </div>
-      </td>
-    </tr>
-  </table>
-</a>
diff --git a/static/chat_view.tmpl b/static/chat_view.tmpl
deleted file mode 100644
index 75ceeaf..0000000
--- a/static/chat_view.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="page-header">
-  <a href="{{ %s : prefix }}{{ %s : back_link }}" class="page-header-button">&larr;</a>
-  <img src="{{ %s : avatar }}" class="page-header-image avatar">
-  <a href="{{ %s : prefix }}/@{{%s:acct}}" class="page-header-title">{{ %s : acct }}</a>
-</div>
-<div class="chat-view">
-  {{ %s : messages }}
-  <div class="anchor"></div>
-</div>
-<form action="" method="post">
-  <table class="chatbox ui-table">
-    <tr>
-      <td>
-        <textarea></textarea>
-      </td>
-      <td>
-        <input type="submit" class="chatbox-btn btn" value="Send">
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/static/chats_page.tmpl b/static/chats_page.tmpl
deleted file mode 100644
index 4ffef75..0000000
--- a/static/chats_page.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{ %s : content }}
diff --git a/static/config_appearance.tmpl b/static/config_appearance.tmpl
deleted file mode 100644
index 764f3ef..0000000
--- a/static/config_appearance.tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="simple-page">
-  <form action="appearance" method="post" enctype="multipart/form-data">
-    <!-- Lets server know we sent it -->
-    <input type="hidden" name="set" value="1">
-    <h1>Appearance</h1>
-    <input class="btn btn-single" type="submit" value="Save">
-    <h3>Theme variant</h3>
-    <ul>
-      <li>
-        <label for="cfgthemevar">Theme variant</label>
-        <select name="theme" id="cfgthemevar">
-          <option value="treebird" title="Created by nekobit (@neko@rdrama.cc) | Former dark variant created by Grumbulon (@grumbulon@freecumextremist.com)">Treebird - Default, simple theme</option>
-          <option value="solarized" title="Created by coyote (@coyote@pl.lain.sh)">Solarized - Solarized colors for pleasant viewing</option>
-        </select>
-      </li>
-    </ul>
-    <h3>Color Scheme</h3>
-    <ul>
-      <li>
-        <input type="radio" id="cfglight" name="themeclr" value="0" checked>
-        <label for="cfglight">Light</label>
-      </li>
-      <li>
-        <input type="radio" id="cfgdark" name="themeclr" value="1">
-        <label for="cfgdark">Dark</label>
-      </li>
-    </ul>
-    <h3>Background</h3>
-    <ul>
-      <li>
-        <input type="file" name="file">
-      </li>
-    </ul>
-    <ul>
-      <li>
-        Sidebar opacity: <input type="range" name="sidebaropacity" min="0" max="255" value="255">
-      </li>
-    </ul>
-    
-    <input class="btn btn-single" type="submit" value="Save">
-  </form>
-</div>
diff --git a/static/config_general.tmpl b/static/config_general.tmpl
deleted file mode 100644
index 50c8ffb..0000000
--- a/static/config_general.tmpl
+++ /dev/null
@@ -1,94 +0,0 @@
-<div class="simple-page">
-  <form action="general" method="post">
-    <!-- Lets server know we sent it -->
-    <input type="hidden" name="set" value="1">
-
-    <h1>General</h1>
-    <input class="btn btn-single" type="submit" value="Save">
-    <h3>Locales</h3>
-    <ul>
-      <li>
-        <label for="cfglang">Language:</label>
-        <select name="lang" id="cfglang">
-          <option value="0">English</option>
-          <option value="1">Spanish</option>
-          <option value="2">Chinese (Traditional)</option>
-        </select>
-      </li>
-    </ul>
-
-    <h3>JavaScript</h3>
-    <ul>
-      <li>
-        <input type="checkbox" id="cfgjs" name="js" value="1" {{%s:js_on}}>
-        <label for="cfgjs">Enable JavaScript - If disabled, overrides options below</label>
-      </li>
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgjsactions" name="jsactions" value="1" {{%s:jsactions_on}}> -->
-      <!--   <label for="cfgjsactions">Quick actions - Likes, Boosts, etc done in background</label> -->
-      <!-- </li> -->
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgjsreply" name="jsreply" value="1" {{%s:jsreply_on}}> -->
-      <!--   <label for="cfgjsreply">Quick reply - Replies don't require redirects</label> -->
-      <!-- </li> -->
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgjslive" name="jslive" value="1" {{%s:jslive_on}}> -->
-      <!--   <label for="cfgjslive">Live update - Statuses, chats, and reactions fetch on the fly</label> -->
-      <!-- </li> -->
-    </ul>
-
-    <h3>Statuses</h3>
-    <ul>
-      <li>
-        <input type="checkbox" id="cfgstatattachments" name="statattachments" value="1" {{%s:status_attachments_on}}>
-        <label for="cfgstatattachments">Show attachments - If disabled, attachments are links instead</label>
-      </li>
-      <li>
-        <input type="checkbox" id="cfgstatgreentexts" name="statgreentexts" value="1" {{%s:status_greentexts_on}}>
-        <label for="cfgstatgreentexts">Show greentexts</label>
-      </li>
-      <li>
-        <input type="checkbox" id="cfgstatdope" name="statdope" value="1" {{%s:status_dopameme_on}}>
-        <label for="cfgstatdope">Show dopameme numbers - Likes, comments, and boost counts</label>
-      </li>
-      <li>
-        <input type="checkbox" id="cfgstatoneclicksoftware" name="statoneclicksoftware" value="1" {{%s:status_oneclicksoftware_on}}>
-        <label for="cfgstatoneclicksoftware">Show Like-Boost button - Show a button in the status which likes and boosts a post</label>
-      </li>
-      <li>
-        <input type="checkbox" id="interactimg" name="interact_img" value="1" {{%s:status_interact_img_on}}>
-        <label for="interactimg">Use IMG for interaction buttons - Compatibility</label>
-      </li>
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgstatemojolikes" name="statemojolikes" value="1" {{%s:status_emojo_likes_on}}> -->
-      <!--   <label for="cfgstatemojolikes">Convert Emoji reacts to likes - Also disables the emoji reaction button</label> -->
-      <!-- </li> -->
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfgstathidemuted" name="stathidemuted" value="1" {{%s:status_hide_muted_on}}> -->
-      <!--   <label for="cfgstathidemuted">Hide statuses from muted users and threads - If disabled, statuses will appear collapsed</label> -->
-      <!-- </li> -->
-    </ul>
-
-    <h3>Instance</h3>
-    <ul>
-      <!-- <li> -->
-      <!--   <input type="checkbox" id="cfginstanceshowshoutbox" name="instanceshowshoutbox" value="1" {{%s:instance_show_shoutbox_on}}> -->
-      <!--   <label for="cfginstanceshowshoutbox">Show instance shoutbox (JS required)</label> -->
-      <!-- </li> -->
-      <li>
-        <input type="checkbox" id="cfginstancepanel" name="instancepanel" value="1" {{%s:instance_panel_on}}>
-        <label for="cfginstancepanel">Show instance panel - <em>Admins should <strong>not</strong> use the instance panel for major announcements</em></label>
-      </li>
-    </ul>
-
-    <h3>Notifications</h3>
-    <ul>
-      <li>
-        <input type="checkbox" id="cfgnotifembed" name="notifembed" value="1" {{%s:notifications_embed_on}}>
-        <label for="cfgnotifembed">Display notifications in iFrame - iFrames separate loading from the main page</label>
-      </li>
-    </ul>
-
-    <input class="btn btn-single" type="submit" value="Save">
-  </form>
-</div>
diff --git a/static/config_sidebar.tmpl b/static/config_sidebar.tmpl
deleted file mode 100644
index 8cdae5b..0000000
--- a/static/config_sidebar.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul class="sidebar-config">
-  <li><a class="sidebarbtn-sub {{%s:general_active}}" href="{{%s:prefix}}/config/general">{{%s:general}}</a></li>
-  <li><a class="sidebarbtn-sub {{%s:appearance_active}}" href="{{%s:prefix}}/config/appearance">{{%s:appearance}}</a></li>
-  <li><a class="sidebarbtn-sub {{%s:account_active}}" href="{{%s:prefix}}/config/account">{{%s:account}}</a></li>
-</ul>
diff --git a/static/contact.tmpl b/static/contact.tmpl
deleted file mode 100644
index 4f6f4af..0000000
--- a/static/contact.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<table class="chat-contact">
-  <tr>
-    <td>
-      <a href="{{%s:prefix}}/@{{%s:acct}}"><img src="{{%s:avatar}}"></a>
-    </td>
-    <td class="account-stub-info-wrapper">
-      <div class="account-stub-info">
-        <a href="{{%s:prefix}}/@{{%s:acct}}">
-          <div class="account-stub-top">
-            <span class="username">{{%s:display_name}}</span>
-          </div>
-          <div class="account-stub-bottom">
-            <span class="instance-info">@{{%s:acct}}</span>
-          </div>
-        </a>
-      </div>
-    </td>
-  </tr>
-</table>
diff --git a/static/custom_emoji_reaction.tmpl b/static/custom_emoji_reaction.tmpl
deleted file mode 100644
index 1904aa6..0000000
--- a/static/custom_emoji_reaction.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<img src="{{ %s : url }}" class="custom-emoji-react">
diff --git a/static/directs_page.tmpl b/static/directs_page.tmpl
deleted file mode 100644
index 18a32eb..0000000
--- a/static/directs_page.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="simple-page">
-  <h1>Direct Messages</h1>
-</div>
-<div class="direct-container">
-  {{%s:direct_content}}
-</div>
diff --git a/static/embed.tmpl b/static/embed.tmpl
deleted file mode 100644
index 20b1112..0000000
--- a/static/embed.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Embed</title>
-    <meta charset="utf-8">
-    <link rel="stylesheet" type="text/css" href="/{{ %s : stylesheet }}.css">
-    <style>
-      html, body
-      {
-      margin: 0;
-      padding: 0;
-      background-color: unset;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="embed">
-      {{ %s : embed }}
-    </div>
-  </body>
-</html>
diff --git a/static/emoji.tmpl b/static/emoji.tmpl
deleted file mode 100644
index 67b6917..0000000
--- a/static/emoji.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="/status/{{%s:status_id}}/react/{{%s:emoji}}" class="emoji">{{%s:emoji}}</a>
diff --git a/static/emoji_picker.tmpl b/static/emoji_picker.tmpl
deleted file mode 100644
index 70cd38a..0000000
--- a/static/emoji_picker.tmpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<div class="emoji-picker">
-  <table class="tabs ui-table">
-    <tr>
-      <td>
-        <label for="cat-smileys">
-          <span class="tab-btn btn btn-alt">😃</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-animals">
-          <span class="tab-btn btn btn-alt">🐻</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-food">
-          <span class="tab-btn btn btn-alt">🍔</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-travel">
-          <span class="tab-btn btn btn-alt">🚀</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-activities">
-          <span class="tab-btn btn btn-alt">⚽</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-objects">
-          <span class="tab-btn btn btn-alt">🔧</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-symbols">
-          <span class="tab-btn btn btn-alt">🔢</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-flags">
-          <span class="tab-btn btn btn-alt">🎌</span>
-        </label>
-      </td>
-    </tr>
-  </table>
-
-  <div class="emoji-picker-emojos-wrapper">
-    <input type="radio" class="hidden" id="cat-smileys" name="emoji-cat" checked>
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_smileys}}
-    </div>
-    <input type="radio" class="hidden" id="cat-animals" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_animals}}
-    </div>
-    <input type="radio" class="hidden" id="cat-food" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_food}}
-    </div>
-    <input type="radio" class="hidden" id="cat-travel" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_travel}}
-    </div>
-    <input type="radio" class="hidden" id="cat-activities" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_activities}}
-    </div>
-    <input type="radio" class="hidden" id="cat-objects" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_objects}}
-    </div>
-    <input type="radio" class="hidden" id="cat-symbols" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_symbols}}
-    </div>
-    <input type="radio" class="hidden" id="cat-flags" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_flags}}
-    </div>
-  </div>
-</div>
diff --git a/static/emoji_plain.tmpl b/static/emoji_plain.tmpl
deleted file mode 100644
index 5fc698f..0000000
--- a/static/emoji_plain.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="emoji">{{%s:emoji}}</span>
diff --git a/static/emoji_reaction.tmpl b/static/emoji_reaction.tmpl
deleted file mode 100644
index 1d1b710..0000000
--- a/static/emoji_reaction.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{{%s:prefix}}/status/{{%s:status_id}}/react/{{%s:emoji}}" class="emoji-react-box {{%s:custom_emoji}} btn btn-alt {{%s:emoji_active}}"><span class="emoji">{{%s:emoji_display}}</span> <span class="emoji-num">{{%u:emoji_count}}<span></a>
diff --git a/static/emoji_reactions.tmpl b/static/emoji_reactions.tmpl
deleted file mode 100644
index 0c78115..0000000
--- a/static/emoji_reactions.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<ul class="emoji-reactions">
-  {{%s:emojis}}
-</ul>
diff --git a/static/error.tmpl b/static/error.tmpl
deleted file mode 100644
index 37ee540..0000000
--- a/static/error.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="e-{{%s:err_type}} {{%s:is_padded}}">{{%s:error}}</span>
diff --git a/static/error_404.tmpl b/static/error_404.tmpl
deleted file mode 100644
index 6291b6b..0000000
--- a/static/error_404.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="simple-page">
-  <h1>404</h1>
-  <p>{{%s:error}}</p>
-</div>
diff --git a/static/expand_btn.tmpl b/static/expand_btn.tmpl
deleted file mode 100644
index 19e5569..0000000
--- a/static/expand_btn.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-          <svg class="expand" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h6v6M14 10l6.1-6.1M9 21H3v-6M10 14l-6.1 6.1"/></svg>
diff --git a/static/expand_btn_img.tmpl b/static/expand_btn_img.tmpl
deleted file mode 100644
index 6a57ac1..0000000
--- a/static/expand_btn_img.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<img class="expand-btn-img" src="/img/compat_icons/maximize.png">
\ No newline at end of file
diff --git a/static/favourites_page.tmpl b/static/favourites_page.tmpl
deleted file mode 100644
index 60de2ff..0000000
--- a/static/favourites_page.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="simple-page">
-  <h1>Favorites</h1>
-</div>
-<div class="favourites-container">
-  {{%s:statuses}}
-</div>
-{{%s:navigation}}
diff --git a/static/follow_svg.tmpl b/static/follow_svg.tmpl
deleted file mode 100644
index 1c4063b..0000000
--- a/static/follow_svg.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="follow" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="20" y1="8" x2="20" y2="14"></line><line x1="23" y1="11" x2="17" y2="11"></line></svg>
diff --git a/static/hashtag.tmpl b/static/hashtag.tmpl
deleted file mode 100644
index 7acfba1..0000000
--- a/static/hashtag.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{{%s:prefix}}/tag/{{%s:tag}}" style="font-size: {{%u:tag_size}}px;" class="hashtag-item">#{{%s:tag}}</a>
diff --git a/static/hashtag_page.tmpl b/static/hashtag_page.tmpl
deleted file mode 100644
index bbf8dd7..0000000
--- a/static/hashtag_page.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="simple-page">
-  <h1>Hashtag - #{{%s:tag}}</h1>
-</div>
-<div class="hashtags-container">
-  {{%s:statuses}}
-</div>
-{{%s:navigation}}
diff --git a/static/in_reply_to.tmpl b/static/in_reply_to.tmpl
deleted file mode 100644
index 0b75e40..0000000
--- a/static/in_reply_to.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="in-reply-to">
-  <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="{{%s:prefix}}/status/{{%s:status_id}}#{{%s:status_id}}"> <span class="in-reply-to-text">{{%s:in_reply_to_text}}</span> <span class="acct">{{%s:acct}}</span></a>
-</span>
diff --git a/static/index.tmpl b/static/index.tmpl
deleted file mode 100644
index 394338f..0000000
--- a/static/index.tmpl
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html {{ %s : background_url }}>
-  <head>
-    <meta charset="utf-8">
-    <title>{{ %s : title }}</title>
-    <link rel="icon" type="image/png" href="/favicon.png">
-    <link rel="stylesheet" type="text/css" href="/treebird.css">
-    {{ %s : theme_str }}
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ %s : title }} is a decentralized social media platform">
-    <style>
-      {{ %s : sidebar_css }}
-    </style>
-  </head>
-  <body>
-    <div id="main-page">
-      <header id="navbar">
-        <label for="leftbar-show">
-          <svg class="leftbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
-        </label>
-        <a href="{{ %s : prefix }}/"><img src="/treebird_logo.png" height="42"></a>
-        <span class="info">{{ %s : name }}</span>
-        <label for="rightbar-show">
-          <svg class="rightbar-btn navbar-btn" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"></path></svg>
-        </label>
-        <label for="searchbar-show">
-          <svg class="search-btn-show" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
-        </label>
-        <input type="checkbox" class="hidden" id="searchbar-show">
-        <div id="navbar-right-container">
-          <div id="navbar-right">
-            {{ %s : sidebar_cnt }}
-            <!-- Searchbox -->
-            <form action="{{ %s : prefix }}/search" method="get">
-              <input type="text" class="group group-left group-inputbox" placeholder="{{ %s : placeholder }}" id="searchbox" name="q"><!-- i hate HTML
-                                                                                                                                           --><input type="submit" class="btn group group-right" value="{{ %s : search_btn }}">
-            </form>
-          </div>
-        </div>
-      </header>
-      <input type="checkbox" id="leftbar-show" class="hidden">
-      <input type="checkbox" id="rightbar-show" class="hidden">
-      <table id="content" class="ui-table">
-        <!-- Navigation -->
-        <tr>
-          <td id="leftbar" class="sidebar">
-            <ul>
-              <li><a class="sidebarbtn {{ %s : active_home }}" href="{{ %s : prefix}}/">{{ %s : home }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_local }}" href="{{ %s : prefix}}/local/">{{ %s : local}}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_federated }}" href="{{ %s : prefix}}/federated/">{{ %s : federated }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_notifications }}" href="{{ %s : prefix}}/notifications">{{ %s : notifications }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_lists }}" href="{{ %s : prefix}}/lists">{{ %s : lists }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_favourites }}" href="{{ %s : prefix}}/favourites">{{ %s : favourites }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_bookmarks }}" href="{{ %s : prefix}}/bookmarks">{{ %s : bookmarks }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_direct }}" href="{{ %s : prefix}}/direct">{{ %s : direct }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_chats }}" href="{{ %s : prefix}}/chats">{{ %s : chats }}</a></li>
-              <li><a class="sidebarbtn {{ %s : active_config }}" href="{{ %s : prefix}}/config">{{ %s : config }}</a></li>
-            </ul>
-            {{ %s : sidebar_leftbar }}
-            {{ %s : instance_panel }}
-            <div class="mini-links">
-              <a href="{{%s:prefix}}/about">{{ %s : about_link_str }}</a>
-              <span class="bullet-separate">&bull;</span>
-              <a href="{{%s:prefix}}/about/license">{{ %s : license_link_str }}</a>
-              <span class="bullet-separate">&bull;</span>
-              <a href="https://fossil.nekobit.net/treebird">{{ %s : source_link_str }}</a>
-            </div>
-          </td>
-          
-          <!-- Display for posts -->
-          <td id="main">
-            {{ %s : main }}
-          </td>
-
-          <!-- Notifications and such -->
-          <td id="rightbar" class="sidebar">
-            {{ %s : sidebar_rightbar }}
-          </td>
-        </tr>
-      </table>
-    </div>
-    
-    <!-- Source -->
-    <script src="/js/main.js"></script>
-    <script src="/js/emoji.js"></script>
-  </body>
-</html>
diff --git a/static/instance.tmpl b/static/instance.tmpl
deleted file mode 100644
index bc95646..0000000
--- a/static/instance.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Instance information
diff --git a/static/interaction_buttons.tmpl b/static/interaction_buttons.tmpl
deleted file mode 100644
index 641f8d8..0000000
--- a/static/interaction_buttons.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="status-interact">
-  <table class="ui-table">
-    <tr>
-      <td>
-        {{ %s : reply_btn }}
-      </td>
-      <td>
-        <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-          <input class="itype" type="hidden" name="itype" value="{{%s:unrepeat}}repeat">
-          <label class="repeat-btn pointer statbtn">
-            {{ %s : repeat_btn }}
-            <span class="count">{{%s:repeats_count}}</span>
-            <input class="hidden" type="submit" value="{{%s:repeat_text}}">
-          </label>
-        </form>
-      </td>
-      <td>
-        <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-          <input class="itype" type="hidden" name="itype" value="{{%s:unfavourite}}like">
-          <label class="pointer statbtn like-btn">
-            {{ %s : like_btn }}
-            <span class="count">{{%s:favourites_count}}</span>
-            <input class="hidden" type="submit" value="{{%s:favourites_text}}">
-          </label>
-        </form>
-      </td>
-      {{%s:likeboost_btn}}
-      {{%s:reactions_btn}}
-      <td>
-        <a target="_parent" href="{{%s:prefix}}/status/{{%s:status_id}}#{{%s:status_id}}" class="pointer statbtn view-btn">
-          {{ %s : expand_btn }}
-        </a>
-      </td>
-      <td>
-        <a href="#{{%s:status_id}}" class="time">{{%s:rel_time}}</a>
-      </td>
-    </tr>
-  </table>
-</div>
diff --git a/static/interactions_page.tmpl b/static/interactions_page.tmpl
deleted file mode 100644
index 46aea1b..0000000
--- a/static/interactions_page.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="simple-page">
-  <h1><a href="{{ %s : back_ref }}" class="page-back-btn">&lt;</a> {{ %s : interaction_str }}</h1>
-</div>
-{{ %s : accts }}
diff --git a/static/license.tmpl b/static/license.tmpl
deleted file mode 100644
index e69de29..0000000
diff --git a/static/like_btn.tmpl b/static/like_btn.tmpl
deleted file mode 100644
index ce973f2..0000000
--- a/static/like_btn.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg class="like {{%s:favourite_active}}" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>
-
diff --git a/static/like_btn_img.tmpl b/static/like_btn_img.tmpl
deleted file mode 100644
index f9049a7..0000000
--- a/static/like_btn_img.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<img class="like-btn-img {{ %s : favourite_active }}" src="{{ %s : prefix }}/img/compat_icons/star.png">
\ No newline at end of file
diff --git a/static/like_svg.tmpl b/static/like_svg.tmpl
deleted file mode 100644
index 3b6527c..0000000
--- a/static/like_svg.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="like" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>
diff --git a/static/likeboost.tmpl b/static/likeboost.tmpl
deleted file mode 100644
index bab876a..0000000
--- a/static/likeboost.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<td>
-  <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-    <input class="itype" type="hidden" name="itype" value="likeboost">
-    <label class="pointer statbtn likeboost-btn">
-      <svg class="one-click-software" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><g stroke-width="1.98"><path d="m19.15 8.5061 2.7598 2.7598-2.7598 2.7598"/><path d="m14.756 11.325s2.5484-0.05032 6.3258 0.01026m-15.639 10.807-2.7598-2.7598 2.7598-2.7598"/><path d="m22.4 15.327v1.2259c0 1.156-1.2356 2.7598-2.7598 2.7598h-16.664"/></g><polygon transform="matrix(.60736 0 0 .60736 .60106 .63577)" points="18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2 15.09 8.26 22 9.27 17 14.14" stroke-width="2.9656"/></g></svg>
-      <input class="hidden" type="submit" value="L+R">
-    </label>
-  </form>
-</td>
diff --git a/static/list.tmpl b/static/list.tmpl
deleted file mode 100644
index 85f9270..0000000
--- a/static/list.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<li>
-  <a href="{{%s:prefix}}/lists/for/{{%s:list_id}}" class="btn split list-item">{{%s:list}}</a><label for="list-edit-{{%s:list_id}}"><span class="btn edit-list-btn">Edit</span></label>
-
-  <input type="checkbox" id="list-edit-{{%s:list_id}}" class="list-radio-show hidden" name="list-radio" class="hidden">
-  <div class="list-edit-content">
-    <form action="{{%s:prefix}}/lists/edit/{{%s:list_id}}" method="post">
-      <input type="text" name="title">
-      <select name="replies_policy">
-        <option value="0">None</option>
-        <option value="1">List</option>
-        <option value="2">Followed</option>
-      </select>
-    </form>
-  </div>
-</li>
diff --git a/static/list_edit.tmpl b/static/list_edit.tmpl
deleted file mode 100644
index 9118d6c..0000000
--- a/static/list_edit.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-asdasd
\ No newline at end of file
diff --git a/static/lists.tmpl b/static/lists.tmpl
deleted file mode 100644
index 3db9ec1..0000000
--- a/static/lists.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="lists-view">
-  <h1 class="lists-view-header">Lists</h1>
-
-  <div class="lists-view-container">
-    <ul class="large-list center">
-      {{%s:lists}}
-    </ul>
-
-    <ul class="large-list center create-list">
-      <form action="{{%s:prefix}}/lists" method="post">
-        <li>
-          <input type="text" name="title" class="create-list-form"><input type="submit" value="Create list" class="create-list-btn btn">
-        </li>
-      </form>
-    </ul>
-  </div>
-</div>
diff --git a/static/login.tmpl b/static/login.tmpl
deleted file mode 100644
index 3bfdea8..0000000
--- a/static/login.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="simple-page">
-  <h1>{{%s:login_header}}</h1>
-  
-  {{%s:error}}
-
-  <form action="{{%s:prefix}}/login" method="post">
-    <div class="form-group">
-      <label for="login-username">{{%s:username}}: </label>
-      <input type="text" id="login-username" name="username">
-    </div>
-    <div class="form-group">
-      <label for="login-password">{{%s:password}}: </label>
-      <input type="password" id="login-password" name="password"><br>
-    </div>
-    <div class="form-group">
-      <input class="btn" type="submit" value="{{%s:login_submit}}">
-    </div>
-  </form>
-
-  <h6>{{%s:instance_text}}</h6>
-
-  <form action="{{%s:prefix}}/login/oauth" method="post">
-    <div class="form-group">
-      <label for="instance-url">{{%s:instance_url}}: </label>
-      <input type="url" id="instance-url" name="instance">
-      <input class="btn" type="submit" value="{{%s:instance_submit}}">
-    </div>
-  </form>
-</div>
diff --git a/static/menu_item.tmpl b/static/menu_item.tmpl
deleted file mode 100644
index 7cb83e6..0000000
--- a/static/menu_item.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<li>
-  <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-    <input type="hidden" name="itype" value="{{%s:itype}}">
-    <input type="submit" class="btn-menu" value="{{%s:text}}">
-  </form>
-</li>
diff --git a/static/message.tmpl b/static/message.tmpl
deleted file mode 100644
index 77183f4..0000000
--- a/static/message.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="message-container {{ %s : is_you }}">
-  <img src="{{ %s : avatar }}" class="avatar">
-  <div class="message-wrapper">
-    <div class="message" id="{{ %s : id }}">
-      <span class="content">{{ %s : content }}</span>
-      <span class="time">12:00</span>
-    </div>
-  </div>
-</div>
-
diff --git a/static/navigation.tmpl b/static/navigation.tmpl
deleted file mode 100644
index 07501b5..0000000
--- a/static/navigation.tmpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<table class="navigation ui-table">
-  <tr>
-    <td class="nav-up btn">
-      <form action="" method="post">
-        <label class="pointer">
-          <span class="nav-btn">Up</span>
-          <input type="submit" class="hidden">
-        </label>
-      </form>
-    </td>
-    <td class="nav-prev btn">
-      <form action="" method="post">
-        <label class="pointer">
-          <input type="hidden" name="start_id" value="{{%s:start_id}}">
-          <input type="hidden" name="min_id" value="{{%s:min_id}}">
-          <span class="nav-btn {{%s:prev_active}}">Previous</span>
-          {{%s:prev_submit}}
-        </label>
-      </form>
-    </td>
-    <td class="nav-next btn">
-      <form action="" method="post">
-        <label class="pointer">
-          <input type="hidden" name="start_id" value="{{%s:start_id}}">
-          <input type="hidden" name="max_id" value="{{%s:max_id}}">
-          <span class="nav-btn">Next</span>
-          <input type="submit" class="hidden">
-        </label>
-      </form>
-    </td>
-  </tr>
-</table>
diff --git a/static/notification.tmpl b/static/notification.tmpl
deleted file mode 100644
index 3fdad91..0000000
--- a/static/notification.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="notification-info">
-  <img src="{{%s:avatar}}" loading="lazy" class="avatar">
-  <div class="notification-user">
-    <span class="notification-text-group-with-icon">
-      <span class="username">{{%s:username}}</span>
-      <span class="action">{{%s:action}}</span>
-    </span>
-    {{%s:action_item}} <!-- If any -->
-  </div>
-</div>
diff --git a/static/notification_action.tmpl b/static/notification_action.tmpl
deleted file mode 100644
index 31e40fb..0000000
--- a/static/notification_action.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<table class="notification notification-regular ui-table">
-  <tr>
-    <td class="pfp-td">
-      <img src="{{%s:avatar}}" loading="lazy">
-    </td>
-    <td class="notification-table-bit">
-      <table class="ui-table">
-        <tr>
-          <td>
-            <div class="notification-info-format">
-              <span class="notification-text-group-with-icon">
-                <span title="{{%s:acct}}" class="username">{{%s:display_name}}</span>
-                <span class="action">{{%s:action}}</span>
-              </span>
-              {{%s:notif_svg}}
-            </div>
-            <span class="notification-content">
-              <a href="{{%s:prefix}}/@{{%s:acct}}">@{{%s:acct}}</a>
-            </span>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
diff --git a/static/notification_compact.tmpl b/static/notification_compact.tmpl
deleted file mode 100644
index 700a66e..0000000
--- a/static/notification_compact.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<table class="notification-compact notification ui-table">
-  <tr>
-    <td class="pfp-compact-td">
-      <img src="{{%s:avatar}}">
-    </td>
-    <td>
-      <div class="notification-info">
-        <span class="notification-text-group{{%s:has_icon}}">
-          <span title="{{%s:acct}}" class="username">{{%s:display_name}}</span>
-          <span class="action">{{%s:action}}</span>
-        </span> {{%s:notif_svg}}
-      </div>
-      <div class="notification-content {{%s:is_status}}">{{%s:content}}</div>
-      <div class="notification-stats">{{%s:stats}}</div>
-    </td>
-  </tr>
-</table>
diff --git a/static/notifications.tmpl b/static/notifications.tmpl
deleted file mode 100644
index 93feac5..0000000
--- a/static/notifications.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="notifications-container">
-  {{%s:notifications}}
-</div>
diff --git a/static/notifications_embed.tmpl b/static/notifications_embed.tmpl
deleted file mode 100644
index e8d7e25..0000000
--- a/static/notifications_embed.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Notifications embed</title>
-    <link rel="stylesheet" type="text/css" href="/treebird.css">
-    {{ %s : theme_str }}
-    <style>
-      html, body
-      {
-          background-color: unset;
-          scrollbar-color: #808080 #eaecf0;
-          scrollbar-width: thin;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="sidebar-embed-container">
-      {{%s:navigation_box}}
-      <div class="sidebar-embed-notifs">
-        {{%s:notifications}}
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/static/notifications_page.tmpl b/static/notifications_page.tmpl
deleted file mode 100644
index cb9cd55..0000000
--- a/static/notifications_page.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="simple-page">
-  <h1>Notifications</h1>
-</div>
-<div class="notifications-container">
-  {{%s:notifications}}
-</div>
-{{%s:navigation}}
diff --git a/static/post.tmpl b/static/post.tmpl
deleted file mode 100644
index b05c7e2..0000000
--- a/static/post.tmpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<form class="reply-form" action="{{%s:prefix}}/status/create" method="post" enctype="multipart/form-data">
-  {{%s:reply_input}}
-  <div class="statusbox">
-    <textarea name="content" placeholder="Just landed in N.Y." rows="5">{{%s:content}}</textarea>
-    <div class="statusfooter">
-      <div class="statusfooter-left">
-        <label>
-          <input type="file" name="file" class="hidden" multiple>
-          <div class="file-upload-btn btn-icon">
-            <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48"></path></svg>
-          </div>
-        </label>
-        <select name="contenttype" class="content-type">
-          <option value="plaintext">Plain Text</option>
-          <option value="markdown">Markdown</option>
-          <option value="html">HTML</option>
-          <option value="bbcode">BBCode</option>
-        </select>
-        <div class="post-group">
-          <!-- Local -->
-          <label>
-            <input type="radio" name="visibility" value="local" class="hidden" {{ %s : local_checked }}>
-            <div class="visibility-icon vis-local">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20 9v11a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V9"/><path d="M9 22V12h6v10M2 10.6L12 2l10 8.6"/></svg>
-            </div>
-          </label>
-          <!-- Direct -->
-          <label>
-            <input type="radio" name="visibility" value="direct" class="hidden" {{ %s : direct_checked }}>
-            <div class="visibility-icon vis-direct">
-                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"></path><polyline points="22,6 12,13 2,6"></polyline></svg>
-            </div>
-          </label>
-          <!-- Private -->
-          <label>
-            <input type="radio" name="visibility" value="private" class="hidden" {{ %s : private_checked }} {{ %s : private_disabled }}>
-            <div class="visibility-icon vis-private">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg>
-            </div>
-          </label>
-          <!-- Unlisted -->
-          <label>
-            <input type="radio" name="visibility" value="unlisted" class="hidden" {{ %s : unlisted_checked }} {{ %s : unlisted_disabled }}>
-            <div class="visibility-icon vis-unlisted">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 9.9-1"></path></svg>
-            </div>
-          </label>
-          <!-- Public -->
-          <label>
-            <input type="radio" name="visibility" value="public" class="hidden" {{ %s : public_checked }} {{ %s : public_disabled }}>
-            <div class="visibility-icon vis-public">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>
-            </div>
-          </label>
-        </div>
-      </div>
-      <div class="statusfooter-right">
-        <input type="submit" value="Post" class="btn post-btn">
-      </div>
-    </div>
-    <div class="file-uploads-container hidden"></div>
-  </div>
-</form>
-
diff --git a/static/quick_login.tmpl b/static/quick_login.tmpl
deleted file mode 100644
index f334aee..0000000
--- a/static/quick_login.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="sidebar-login">
-  <form action="{{%s:prefix}}/login" method="post">
-    <div class="form-group">
-      <label for="login-username">{{%s:username}}: </label>
-      <input type="text" id="login-username" name="username">
-    </div>
-    <div class="form-group">
-      <label for="login-password">{{%s:password}}: </label>
-      <input type="password" id="login-password" name="password"><br>
-    </div>
-    <div class="form-group">
-      <input class="btn" type="submit" value="{{%s:login}}">
-    </div>
-  </form>
-</div>
diff --git a/static/reactions_btn.tmpl b/static/reactions_btn.tmpl
deleted file mode 100644
index 18e9e42..0000000
--- a/static/reactions_btn.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<td>
-  <a target="_parent" href="{{%s:prefix}}/status/{{%s:status_id}}/react#{{%s:status_id}}" class="pointer statbtn react-btn">
-    <svg class="emoji-btn" width="20" height="20" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="10"/><g><line x1="9" x2="9" y1="6.9367" y2="11.755" stroke-width="1.7916"/><line x1="15" x2="15" y1="6.9367" y2="11.755" stroke-width="1.7916"/><path d="m7.0891 15.099s4.7206 4.7543 9.7109 0" stroke-linecap="round" stroke-linejoin="miter" stroke-width="1.9764"/></g></svg>
-
-  </a>
-  {{%s:emoji_picker}}
-</td>
diff --git a/static/repeat_btn.tmpl b/static/repeat_btn.tmpl
deleted file mode 100644
index 68ab520..0000000
--- a/static/repeat_btn.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg class="repeat {{%s:repeat_active}}" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 2.1l4 4-4 4"/><path d="M3 12.2v-2a4 4 0 0 1 4-4h12.8M7 21.9l-4-4 4-4"/><path d="M21 11.8v2a4 4 0 0 1-4 4H4.2"/></svg>
-
diff --git a/static/repeat_btn_img.tmpl b/static/repeat_btn_img.tmpl
deleted file mode 100644
index b3b6398..0000000
--- a/static/repeat_btn_img.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<img class="repeat-btn-img {{ %s : repeat_active }}" src="{{ %s : prefix }}/img/compat_icons/repeat.png">
\ No newline at end of file
diff --git a/static/repeat_svg.tmpl b/static/repeat_svg.tmpl
deleted file mode 100644
index 6712353..0000000
--- a/static/repeat_svg.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="repeat" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 2.1l4 4-4 4"/><path d="M3 12.2v-2a4 4 0 0 1 4-4h12.8M7 21.9l-4-4 4-4"/><path d="M21 11.8v2a4 4 0 0 1-4 4H4.2"/></svg>
diff --git a/static/reply_btn.tmpl b/static/reply_btn.tmpl
deleted file mode 100644
index 0dd62bd..0000000
--- a/static/reply_btn.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<svg class="reply" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg>
-
diff --git a/static/reply_btn_img.tmpl b/static/reply_btn_img.tmpl
deleted file mode 100644
index 3edcc5e..0000000
--- a/static/reply_btn_img.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<img class="expand-btn-img" src="/img/compat_icons/corner-down-right.png">
\ No newline at end of file
diff --git a/static/reply_checkbox.tmpl b/static/reply_checkbox.tmpl
deleted file mode 100644
index e69de29..0000000
diff --git a/static/reply_link.tmpl b/static/reply_link.tmpl
deleted file mode 100644
index 0de803f..0000000
--- a/static/reply_link.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-        <a target="_parent" href="{{%s:prefix}}/status/{{%s:status_id}}/reply#{{%s:status_id}}" class="pointer statbtn reply-btn">
-            {{ %s : reply_btn }}
-            <span class="count">{{%s:reply_count}}</span>
-        </a>
-        
\ No newline at end of file
diff --git a/static/scrobble.tmpl b/static/scrobble.tmpl
deleted file mode 100644
index 28bcc2e..0000000
--- a/static/scrobble.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div id="scrobble-{{%s:scrobble_id}}" class="scrobble ui-table">
-  <table class="scrobblist-info">
-    <td class="pfp-compact-td">
-      <img class="pfp-img-scrobble" src="{{%s:avatar}}">
-    </td>
-    <td class="scrobblist-info-text">
-      <span class="username">{{%s:username}}</span> <span class="scrobblist-activity">{{%s:activity}}</span>
-    </td>      
-  </table>
-  <table class="scrobbles">
-    <tr class="scrobble-title">
-      <td class="scrobble-key">{{%s:title_key}}</td>
-      <td class="scrobble-value">{{%s:title}}</td>
-    </tr>
-    <tr class="scrobble-artist">
-      <td class="scrobble-key">{{%s:artist_key}}</td>
-      <td class="scrobble-value">{{%s:artist}}</td>
-    </tr>
-    <tr class="scrobble-album">
-      <td class="scrobble-key">{{%s:album_key}}</td>
-      <td class="scrobble-value">{{%s:album}}</td>
-    </tr>
-    <tr class="scrobble-length">
-      <td class="scrobble-key">{{%s:length_key}}</td>
-      <td class="scrobble-value">{{%d:length}}</td>
-    </tr>
-  </table>
-</div>
diff --git a/static/search.tmpl b/static/search.tmpl
deleted file mode 100644
index b3f9e1b..0000000
--- a/static/search.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<table class="tabs ui-table">
-  <tr>
-    <td>
-      <a href="{{%s:prefix}}/search/statuses?q={{%s:query}}"><input class="tab-btn btn {{%s:statuses_active}}" type="button" value="{{%s:statuses}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/search/accounts?q={{%s:query}}"><input class="tab-btn btn {{%s:accounts_active}}" type="button" value="{{%s:accounts}}"></a>
-    </td>
-    <td>
-      <a href="{{%s:prefix}}/search/hashtags?q={{%s:query}}"><input class="tab-btn btn {{%s:hashtags_active}}" type="button" value="{{%s:hashtags}}"></a>
-    </td>
-  </tr>
-</table>
-
-<div class="search-results">
-  {{%s:results}}
-</div>
diff --git a/static/search_all.tmpl b/static/search_all.tmpl
deleted file mode 100644
index 6a45d41..0000000
--- a/static/search_all.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<table class="tabs ui-table">
-  <tr>
-    <td>
-      <label for="statuses-results-hidden">
-        <span class="tab-btn btn">{{%s:statuses}}</span>
-      </label>
-    </td>
-    <td>
-      <label for="accounts-results-hidden">
-        <span class="tab-btn btn">{{%s:accounts}}</span>
-      </label>
-    </td>
-    <td>
-      <label for="hashtags-results-hidden">
-        <span class="tab-btn btn">{{%s:hashtags}}</span>
-      </label>
-    </td>
-  </tr>
-</table>
-
-<div class="search-results">
-  <input type="radio" class="search-page-hidden hidden" id="statuses-results-hidden" name="searchpage" checked>
-  <div class="statuses-results search-page">
-    {{%s:statuses_results}}
-  </div>
-  <input type="radio" class="search-page-hidden hidden" id="accounts-results-hidden" name="searchpage">
-  <div class="accounts-results search-page">
-    {{%s:accounts_results}}
-  </div>
-  <input type="radio" class="search-page-hidden hidden" id="hashtags-results-hidden" name="searchpage">
-  <div class="hashtags-results search-page">
-    {{%s:hashtags_results}}
-  </div>
-</div>
diff --git a/static/status.tmpl b/static/status.tmpl
deleted file mode 100644
index 5dc2fd9..0000000
--- a/static/status.tmpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<input type="checkbox" class="status-hide" id="status-toggle-{{%s:status_id}}" {{ %s:thread_hidden }}>
-<div class="status" id="{{%s:status_id}}">
-    {{ %s : notif_info }}
-    <table class="status-table ui-table">
-        <tr>
-            <td class="pfp-td {{%s:is_cat}} {{%s:is_bun}}">
-                <img src="{{%s:avatar}}" loading="lazy">
-            </td>
-            <td class="status-info">
-                <div class="poster-stats">
-                    <span class="username">{{%s:username}}</span>
-                    <a class="instance-info" href="{{%s:prefix}}/@{{%s:acct}}">{{%s:acct}}</a>
-                    <span class="alignend">
-                        <div class="menu-container status-visibility">
-                            {{%s:visibility}}
-                            <div class="menu">
-                                <ul>
-                                    <li>
-                                        <form action="{{%s:prefix}}/status/{{%s:status_id}}/interact" method="post">
-                                            <input type="hidden" name="itype" value="{{%s:unmute}}mute">
-                                            <input type="submit" class="btn-menu" value="{{%s:unmute_btn}}">
-                                        </form>
-                                    </li>
-                                    <li>
-                                        <form action="{{%s:prefix}}/status/{{%s:status_id}/interact" method="post">
-                                            <input type="hidden" name="itype" value="{{%s:unbookmark}}bookmark">
-                                            <input type="submit" class="btn-menu" value="{{%s:unbookmark_btn}}">
-                                        </form>
-                                    </li>
-                                    {{%s:pin_status}}
-                                    {{%s:delete_status}}
-                                </ul>
-                            </div>
-                        </div>
-                        <label for="status-toggle-{{%s:status_id}}" class="status-view"></label>
-                    </span>
-                </div>
-                <div class="status-data">
-                    {{%s:in_reply_to_str}}
-                    <span class="status-content">
-                        {{%s:status_content}}
-                    </span>
-                    {{%s:attachments}}
-                    {{%s:interactions}}
-                    {{%s:emoji_reactions}}
-                    {{%s:interaction_btns}}
-                </div>
-            </td>
-        </tr>
-    </table>
-</div>
-<input type="checkbox" class="quickreply-hide hidden" id="status-quickreply-{{%s:status_id}}">
-{{ %s : reply }}
-
diff --git a/static/status_interaction_profile.tmpl b/static/status_interaction_profile.tmpl
deleted file mode 100644
index 3ae1e72..0000000
--- a/static/status_interaction_profile.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<img title="{{%s:acct}}" class="pfp-interaction" src="{{%s:avatar}}">
diff --git a/static/status_interactions.tmpl b/static/status_interactions.tmpl
deleted file mode 100644
index fb16fa5..0000000
--- a/static/status_interactions.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="status-interactions">
-  <div class="status-interactions-labels">
-    <!-- Reblog count -->
-    {{%s:reblogs_count}}
-    <!-- Favourites count -->
-    {{%s:favourites_count}}
-  </div>
-  <div class="status-interactions-pfps">
-    {{%s:users}}
-  </div>
-</div>
diff --git a/static/status_interactions_label.tmpl b/static/status_interactions_label.tmpl
deleted file mode 100644
index 6445520..0000000
--- a/static/status_interactions_label.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href="{{%s:prefix}}/status/{{%s:status_id}}/{{%s:action}}" class="header-btn btn">
-  <span class="btn-header">{{%s:header}}</span>
-  <span class="btn-content">{{%d:value}}</span>
-</a>
diff --git a/static/test.tmpl b/static/test.tmpl
deleted file mode 100644
index c979367..0000000
--- a/static/test.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="simple-page">
-  <h1>Test page</h1>
-  <p>Test your nginx/apache and browser here</p>
-  <form action="test" method="get">
-    <input name="value" type="text">
-    <input type="submit" value="GET">
-  </form>
-
-  <form action="test" method="post">
-    <input name="value" type="text">
-    <input type="submit" value="POST">
-  </form>
-  
-  <table id="env-table" class="present">
-    <tr>
-      <th><b>ENV</b></th>
-      <th><b>Value</b></th>
-    </tr>
-    <tr>
-      <td>HTTP_COOKIE</td>
-      <td>{{%s:HTTP_COOKIE}}</td>
-    </tr>
-    <tr>
-      <td>PATH_INFO</td>
-      <td>{{%s:PATH_INFO}}</td>
-    </tr>
-    <tr>
-      <td>QUERY_STRING</td>
-      <td>{{%s:QUERY_STRING}}</td>
-    </tr>
-    <tr>
-      <td>REQUEST_METHOD</td>
-      <td>{{%s:REQUEST_METHOD}}</td>
-    </tr>
-    <tr>
-      <td>SCRIPT_NAME</td>
-      <td>{{%s:SCRIPT_NAME}}</td>
-    </tr>
-    <tr>
-      <td>HTTP_REFERER</td>
-      <td>{{%s:HTTP_REFERER}}</td>
-    </tr>
-    <tr>
-      <td>HTTP_USER_AGENT</td>
-      <td>{{%s:HTTP_USER_AGENT}}</td>
-    </tr>
-    <tr>
-      <td>CONTENT_LENGTH</td>
-      <td>{{%s:CONTENT_LENGTH}}</td>
-    </tr>
-  </table>
-</div>
diff --git a/static/thread_page_btn.tmpl b/static/thread_page_btn.tmpl
deleted file mode 100644
index 479f871..0000000
--- a/static/thread_page_btn.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<table class="navigation ui-table">
-  <tr>
-    <td class="thread-nav-stub">
-      <a class="thread-nav-btn btn" href="{{ %s : prefix }}/status/{{ %s : status_first }}#{{ %s : status_first }}"><span class="nav-symbol">&uarr;&uarr;</span></a>
-    </td>
-    <td class="thread-nav-td">
-      <a class="thread-nav-btn btn" href="{{ %s : prefix }}/status/{{ %s : status_before }}#{{ %s : status_before }}"><span class="nav-symbol">&uarr;</span> Up</a>
-    </td>
-    <td class="thread-nav-td">
-      <a class="thread-nav-btn btn" href="{{ %s : prefix }}/status/{{ %s : status_after }}#{{ %s : status_after }}"><span class="nav-symbol">&darr;</span> Down</a>
-    </td>
-    <td class="thread-nav-stub">
-      <a class="thread-nav-btn btn thread-nav-stub" href="{{ %s : prefix }}/status/{{ %s : status_last }}#{{ %s : status_last }}"><span class="nav-symbol">&darr;&darr;</span></a>
-    </td>
-  </tr>
-</table>
diff --git a/static/timeline_options.tmpl b/static/timeline_options.tmpl
deleted file mode 100644
index 1b584f3..0000000
--- a/static/timeline_options.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="menubar">
-  <form action="." method="post">
-    {{ %s : only_media }}
-    <input type="checkbox" name="only_media" value="1" {{ %s : only_media_active }}>
-    <span class="bullet-separate">&bull;</span>
-    {{ %s : replies }}
-    <select name="replies_only">
-      <option value="0">Show replies</option>
-      <option value="1">Self</option>
-      <option value="2">Following</option>
-    </select>
-    <input type="submit" value="Filter">
-  </form>
-</div>

From d033f363c340fef655a77d7918bd97c4d4cb6e65 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sat, 20 Aug 2022 03:32:29 +0000
Subject: [PATCH 110/143] Emoji picker and refactoring bullshit still

FossilOrigin-Name: 8ac12640e4940972a2528fb690e7a1736208275dcb053edc9bf418642a82867c
---
 perl/emojis.pm      |   8 ++
 src/about.c         |   3 -
 src/account.c       | 272 --------------------------------------------
 src/account.h       |  27 -----
 src/attachments.c   |  81 -------------
 src/attachments.h   |   2 -
 src/base_page.c     |   5 -
 src/conversations.c | 132 ---------------------
 src/conversations.h |  21 ----
 src/emoji.c         |  73 +++---------
 src/emoji.h         |   1 -
 11 files changed, 23 insertions(+), 602 deletions(-)

diff --git a/perl/emojis.pm b/perl/emojis.pm
index 0cb07d4..73ca9c7 100644
--- a/perl/emojis.pm
+++ b/perl/emojis.pm
@@ -22,4 +22,12 @@ sub generate_emoji
     to_template(\%vars, \$data->{'emoji.tt'});
 }
 
+sub emoji_picker
+{
+    my ($ssn, $data, $emojis) = @_;
+
+
+    to_template(\%vars, \$data->{'emoji_picker.tt'});
+}
+
 1;
diff --git a/src/about.c b/src/about.c
index a59c458..79228c8 100644
--- a/src/about.c
+++ b/src/about.c
@@ -20,9 +20,6 @@
 #include "base_page.h"
 #include "about.h"
 
-#include "../static/about.ctmpl"
-#include "../static/license.ctmpl"
-
 void content_about(PATH_ARGS)
 {
     PERL_STACK_INIT;
diff --git a/src/account.c b/src/account.c
index 9634b20..432b897 100644
--- a/src/account.c
+++ b/src/account.c
@@ -35,17 +35,6 @@
 #include "emoji.h"
 #include "timeline.h"
 
-// Files
-#include "../static/account.ctmpl"
-#include "../static/account_info.ctmpl"
-#include "../static/account_follow_btn.ctmpl"
-#include "../static/favourites_page.ctmpl"
-#include "../static/bookmarks_page.ctmpl"
-#include "../static/account_stub.ctmpl"
-#include "../static/account_sidebar.ctmpl"
-#include "../static/account_current_menubar.ctmpl"
-#include "../static/basic_page.ctmpl"
-
 #define FOLLOWS_YOU_HTML "<span class=\"acct-badge\">%s</span>"
 
 struct account_args
@@ -55,22 +44,6 @@ struct account_args
     uint8_t flags;
 };
 
-char* load_account_info(struct mstdnt_account* acct,
-                        size_t* size)
-{
-    char* info_html;
-    char* note = emojify(acct->note,
-                         acct->emojis,
-                         acct->emojis_len);
-    struct account_info_template data = {
-        .acct_note = note
-    };
-    info_html = tmpl_gen_account_info(&data, size);
-    if (note != acct->note)
-        free(note);
-    return info_html;
-}
-
 static char* accounts_page(HV* session_hv,
                            mastodont_t* api,
                            struct mstdnt_account* acct,
@@ -109,42 +82,6 @@ static char* accounts_page(HV* session_hv,
     return output;
 }
 
-char* construct_account_sidebar(struct mstdnt_account* acct, size_t* size)
-{
-    char* result = NULL;
-    char* sanitized_display_name = NULL;
-    char* display_name = NULL;
-    char* header_css = NULL;
-    if (acct->display_name)
-    {
-        sanitized_display_name = sanitize_html(acct->display_name);
-        display_name = emojify(sanitized_display_name,
-                               acct->emojis,
-                               acct->emojis_len);
-    }
-    easprintf(&header_css, "style=\"background: linear-gradient(var(--account-overlay-gradient-top), var(--account-overlay-gradient-bottom)), url(%s);\"", acct->header);
-    struct account_sidebar_template data = {
-        .prefix = config_url_prefix,
-        .avatar = acct->avatar,
-        .username = display_name,
-        .header = acct->header ? header_css : "",
-        .statuses_text = L10N[L10N_EN_US][L10N_TAB_STATUSES],
-        .following_text = L10N[L10N_EN_US][L10N_TAB_FOLLOWING],
-        .followers_text = L10N[L10N_EN_US][L10N_TAB_FOLLOWERS],
-        .statuses_count = acct->statuses_count,
-        .following_count = acct->following_count,
-        .followers_count = acct->followers_count,
-        .acct = acct->acct,
-    };
-    result = tmpl_gen_account_sidebar(&data, size);
-    if (sanitized_display_name != acct->display_name) free(sanitized_display_name);
-    if (display_name != sanitized_display_name &&
-        display_name != acct->display_name)
-        free(display_name);
-    free(header_css);
-    return result;
-}
-
 static char* account_followers_cb(HV* session_hv,
                                   struct session* ssn,
                                   mastodont_t* api,
@@ -350,215 +287,6 @@ static void fetch_account_page(FCGX_Request* req,
     Safefree(data);
 }
 
-size_t construct_account_page(struct session* ssn,
-                              char** result,
-                              struct account_page* page,
-                              char* content)
-{
-    if (!page->account)
-    {
-        *result = NULL;
-        return 0;
-    }
-    size_t size;
-    struct mstdnt_relationship* rel = page->relationship;
-    int is_same_user = ssn->logged_in && strcmp(ssn->acct.acct, page->acct) == 0;
-    char* follow_btn = NULL,
-        * follow_btn_text = NULL,
-        * follows_you = NULL,
-        * info_html = NULL,
-        * is_blocked = NULL,
-        * menubar = NULL,
-        * display_name = NULL,
-        * sanitized_display_name = NULL;
-
-    sanitized_display_name = sanitize_html(page->display_name);
-    display_name = emojify(sanitized_display_name,
-                           page->account->emojis,
-                           page->account->emojis_len);
-
-    // Check if note is not empty
-    if (page->note && strcmp(page->note, "") != 0)
-    {
-        info_html = load_account_info(page->account, NULL);
-    }
-
-    // Display follow button only if not the same user
-    if (rel && !is_same_user)
-    {
-        if (MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_FOLLOWED_BY))
-            easprintf(&follows_you, FOLLOWS_YOU_HTML, L10N[page->locale][L10N_FOLLOWS_YOU]);
-
-        if (MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_BLOCKED_BY))
-            is_blocked = construct_error(L10N[page->locale][L10N_BLOCKED], E_NOTICE, 0, NULL);
-
-        if (MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_REQUESTED))
-            follow_btn_text = L10N[page->locale][L10N_FOLLOW_PENDING];
-        else if (MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_FOLLOWING))
-            follow_btn_text = L10N[page->locale][L10N_FOLLOWING];
-        else
-            follow_btn_text = L10N[page->locale][L10N_FOLLOW];
-
-        struct account_follow_btn_template data = {
-            .prefix = config_url_prefix,
-            .active = (rel && MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_FOLLOWING)
-                       ? "active" : ""),
-            .follow_text = follow_btn_text,
-            .unfollow = (rel && (MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_FOLLOWING) ||
-                                 MSTDNT_FLAG_ISSET(rel->flags, MSTDNT_RELATIONSHIP_REQUESTED))
-                         ? "un" : ""),
-            .userid = page->id,
-        };
-        
-        follow_btn = tmpl_gen_account_follow_btn(&data, NULL);
-    }
-
-    // Display menubar with extra options for access if same user
-    if (is_same_user)
-    {
-        struct account_current_menubar_template acmdata = {
-            .prefix = config_url_prefix,
-            .blocked_str = "Blocks",
-            .muted_str = "Mutes",
-            .favourited_str = "Favorites",
-        };
-
-        menubar = tmpl_gen_account_current_menubar(&acmdata, NULL);
-    }
-
-    struct account_template acct_data = {
-        .is_blocked = STR_NULL_EMPTY(is_blocked),
-        .header = page->header_image,
-        .menubar = menubar,
-        .display_name = display_name,
-        .acct = page->acct,
-        .prefix = config_url_prefix,
-        .userid = page->id,
-        .follows_you = follows_you,
-        .unsubscribe = (rel && MSTDNT_FLAG_ISSET(rel->flags,
-                                                 MSTDNT_RELATIONSHIP_NOTIFYING)
-                        ? "un" : ""),
-        .subscribe_text =  (rel && MSTDNT_FLAG_ISSET(rel->flags,
-                                                     MSTDNT_RELATIONSHIP_NOTIFYING)
-                            ? L10N[page->locale][L10N_UNSUBSCRIBE] : L10N[page->locale][L10N_SUBSCRIBE]),
-        .unblock = (rel && MSTDNT_FLAG_ISSET(rel->flags,
-                                             MSTDNT_RELATIONSHIP_BLOCKING)
-                      ? "un" : ""),
-        .block_text = (rel && MSTDNT_FLAG_ISSET(rel->flags,
-                                               MSTDNT_RELATIONSHIP_BLOCKING)
-                      ? L10N[page->locale][L10N_UNBLOCK] : L10N[page->locale][L10N_BLOCK]),
-        .unmute = (rel && MSTDNT_FLAG_ISSET(rel->flags,
-                                            MSTDNT_RELATIONSHIP_MUTING)
-                   ? "un" : ""),
-        .mute_text = (rel && MSTDNT_FLAG_ISSET(rel->flags,
-                                               MSTDNT_RELATIONSHIP_MUTING)
-                      ? L10N[page->locale][L10N_UNMUTE] : L10N[page->locale][L10N_MUTE]),
-        .tab_statuses_text = L10N[page->locale][L10N_TAB_STATUSES],
-        .statuses_count = page->statuses_count,
-        .tab_following_text = L10N[page->locale][L10N_TAB_FOLLOWING],
-        .following_count = page->following_count,
-        .tab_followers_text = L10N[page->locale][L10N_TAB_FOLLOWERS],
-        .followers_count = page->followers_count,
-        .follow_btn = follow_btn,
-        .avatar = page->profile_image,
-        .info = info_html,
-        .tab_statuses_focused = MAKE_FOCUSED_IF(page->tab, ACCT_TAB_STATUSES),
-        .tab_statuses_text = L10N[page->locale][L10N_TAB_STATUSES],
-        .tab_scrobbles_focused = MAKE_FOCUSED_IF(page->tab, ACCT_TAB_SCROBBLES),
-        .tab_scrobbles_text = L10N[page->locale][L10N_TAB_SCROBBLES],
-        .tab_media_focused = MAKE_FOCUSED_IF(page->tab, ACCT_TAB_MEDIA),
-        .tab_media_text = L10N[page->locale][L10N_TAB_MEDIA],
-        .tab_pinned_focused = MAKE_FOCUSED_IF(page->tab, ACCT_TAB_PINNED),
-        .tab_pinned_text = L10N[page->locale][L10N_TAB_PINNED],
-        .acct_content = content
-    };
-
-    *result = tmpl_gen_account(&acct_data, &size);
-    
-    free(info_html);
-    free(follows_you);
-    free(follow_btn);
-    free(is_blocked);
-    free(menubar);
-    if (sanitized_display_name != page->display_name) free(sanitized_display_name);
-    if (display_name != page->display_name &&
-        display_name != sanitized_display_name)
-        free(display_name);
-    return size;
-}
-
-char* construct_account(mastodont_t* api,
-                        struct mstdnt_account* acct,
-                        uint8_t flags,
-                        size_t* size)
-{
-    char* result;
-    char* sanitized_display_name = sanitize_html(acct->display_name);
-    struct account_stub_template data = {
-        .prefix = config_url_prefix,
-        .acct = acct->acct,
-        .avatar = acct->avatar,
-        .display_name = sanitized_display_name,
-    };
-
-    result = tmpl_gen_account_stub(&data, size);
-    if (sanitized_display_name != acct->display_name) free(sanitized_display_name);
-    return result;
-}
-
-static char* construct_account_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct account_args* args = passed;
-    return construct_account(args->api, args->accts + index, args->flags, res);
-}
-
-char* construct_accounts(mastodont_t* api,
-                         struct mstdnt_account* accounts,
-                         size_t size,
-                         uint8_t flags,
-                         size_t* ret_size)
-{
-    if (!(accounts && size)) return NULL;
-    struct account_args acct_args = {
-        .api = api,
-        .accts = accounts,
-        .flags = flags,
-    };
-    return construct_func_strings(construct_account_voidwrap, &acct_args, size, ret_size);
-}
-
-char* load_account_page(struct session* ssn,
-                        mastodont_t* api,
-                        struct mstdnt_account* acct,
-                        struct mstdnt_relationship* relationship,
-                        enum account_tab tab,
-                        char* content,
-                        size_t* res_size)
-{
-    size_t size;
-    char* result;
-    struct account_page page = {
-        .locale = l10n_normalize(ssn->config.lang),
-        .account = acct,
-        .header_image = acct->header,
-        .profile_image = acct->avatar,
-        .acct = acct->acct,
-        .display_name = acct->display_name,
-        .statuses_count = acct->statuses_count,
-        .following_count = acct->following_count,
-        .followers_count = acct->followers_count,
-        .note = acct->note,
-        .id = acct->id,
-        .tab = tab,
-        .relationship = relationship,
-    };
-
-    size = construct_account_page(ssn, &result, &page, content);
-
-    if (res_size) *res_size = size;
-    return result;
-}
-
 void content_account_statuses(PATH_ARGS)
 {
     struct mstdnt_account_statuses_args args = {
diff --git a/src/account.h b/src/account.h
index 6c3615f..6ba8c47 100644
--- a/src/account.h
+++ b/src/account.h
@@ -57,33 +57,6 @@ struct account_page
 };
 
 void get_account_info(mastodont_t* api, struct session* ssn);
-char* construct_account_sidebar(struct mstdnt_account* acct, size_t* size);
-
-char* construct_account(mastodont_t* api,
-                        struct mstdnt_account* account,
-                        uint8_t flags,
-                        size_t* size);
-char* construct_accounts(mastodont_t* api,
-                         struct mstdnt_account* accounts,
-                         size_t size,
-                         uint8_t flags,
-                         size_t* ret_size);
-
-size_t construct_account_page(struct session *ssn,
-                              char** result,
-                              struct account_page* page,
-                              char* content);
-
-char* load_account_page(struct session* ssn,
-                        mastodont_t* api,
-                        struct mstdnt_account* acct,
-                        struct mstdnt_relationship* relationship,
-                        enum account_tab tab,
-                        char* content,
-                        size_t* res_size);
-
-char* load_account_info(struct mstdnt_account* acct,
-                        size_t* size);
 
 void content_account_followers(PATH_ARGS);
 void content_account_following(PATH_ARGS);
diff --git a/src/attachments.c b/src/attachments.c
index 953308b..a623e43 100644
--- a/src/attachments.c
+++ b/src/attachments.c
@@ -24,13 +24,6 @@
 #include "attachments.h"
 #include "string_helpers.h"
 
-// Pages
-#include "../static/attachments.ctmpl"
-#include "../static/attachment_image.ctmpl"
-#include "../static/attachment_gifv.ctmpl"
-#include "../static/attachment_video.ctmpl"
-#include "../static/attachment_link.ctmpl"
-#include "../static/attachment_audio.ctmpl"
 
 struct attachments_args
 {
@@ -123,80 +116,6 @@ void cleanup_media_ids(struct session* ssn, char** media_ids)
     free(media_ids);
 }
 
-char* construct_attachment(struct session* ssn,
-                           mstdnt_bool sensitive,
-                           struct mstdnt_attachment* att,
-                           size_t* str_size)
-{
-    // Due to how similar the attachment templates are, we're just going to use their data files
-    // and not generate any templates, saves some LOC!
-    char* att_html;
-    size_t s;
-    const char* attachment_str;
-    if (!att) return NULL;
-
-    if (ssn->config.stat_attachments)
-        switch (att->type)
-        {
-        case MSTDNT_ATTACHMENT_IMAGE:
-            attachment_str = data_attachment_image; break;
-        case MSTDNT_ATTACHMENT_GIFV:
-            attachment_str = data_attachment_gifv; break;
-        case MSTDNT_ATTACHMENT_VIDEO:
-            attachment_str = data_attachment_video; break;
-        case MSTDNT_ATTACHMENT_AUDIO:
-            attachment_str = data_attachment_audio; break;
-        case MSTDNT_ATTACHMENT_UNKNOWN: // Fall through
-        default:
-            attachment_str = data_attachment_link; break;
-        }
-    else
-        attachment_str = data_attachment_link;
-
-    // Images/visible content displays sensitive placeholder after
-    if ((att->type == MSTDNT_ATTACHMENT_IMAGE ||
-         att->type == MSTDNT_ATTACHMENT_GIFV ||
-         att->type == MSTDNT_ATTACHMENT_VIDEO) &&
-        ssn->config.stat_attachments)
-    {
-        s = easprintf(&att_html, attachment_str,
-                      att->url,
-                      sensitive ? "<div class=\"sensitive-contain sensitive\"></div>" : "");
-    }
-    else {
-        s = easprintf(&att_html, attachment_str,
-                      sensitive ? "sensitive" : "",
-                      att->url);
-    }
-    
-    if (str_size) *str_size = s;
-    return att_html;
-}
-
-static char* construct_attachments_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct attachments_args* args = passed;
-    return construct_attachment(args->ssn, args->sensitive, args->atts + index, res);
-}
-
-char* construct_attachments(struct session* ssn,
-                            mstdnt_bool sensitive,
-                            struct mstdnt_attachment* atts,
-                            size_t atts_len,
-                            size_t* str_size)
-{
-    size_t elements_size;
-    struct attachments_args args = { ssn, atts, sensitive };
-    char* elements = construct_func_strings(construct_attachments_voidwrap, &args, atts_len, &elements_size);
-    char* att_view;
-
-    size_t s = easprintf(&att_view, data_attachments, elements);
-    if (str_size) *str_size = s;
-    // Cleanup
-    free(elements);
-    return att_view;
-}
-
 HV* perlify_attachment(struct mstdnt_attachment* const attachment)
 {
     if (!attachment) return NULL;
diff --git a/src/attachments.h b/src/attachments.h
index 21e5100..e576a5c 100644
--- a/src/attachments.h
+++ b/src/attachments.h
@@ -34,8 +34,6 @@ int try_upload_media(struct mstdnt_storage** storage,
                      char*** media_ids);
 void cleanup_media_storages(struct session* ssn, struct mstdnt_storage* storage);
 void cleanup_media_ids(struct session* ssn, char** media_ids);
-char* construct_attachment(struct session* ssn, mstdnt_bool sensitive, struct mstdnt_attachment* att, size_t* str_size);
-char* construct_attachments(struct session* ssn, mstdnt_bool sensitive, struct mstdnt_attachment* atts, size_t atts_len, size_t* str_size);
 void api_attachment_create(PATH_ARGS);
 
 // Perl
diff --git a/src/base_page.c b/src/base_page.c
index 31ca2ff..3bdd1a7 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -30,11 +30,6 @@
 #include <fcgi_stdio.h>
 #include "global_cache.h"
 
-// Files
-#include "../static/index.ctmpl"
-#include "../static/quick_login.ctmpl"
-#include "../templates/main.ctt"
-
 #define BODY_STYLE "style=\"background:url('%s');\""
 
 void render_base_page(struct base_page* page, FCGX_Request* req, struct session* ssn, mastodont_t* api)
diff --git a/src/conversations.c b/src/conversations.c
index f48a561..361e9ff 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -26,138 +26,6 @@
 #include "error.h"
 #include "base_page.h"
 
-// Files
-#include "../static/chat.ctmpl"
-#include "../static/chats_page.ctmpl"
-#include "../static/message.ctmpl"
-#include "../static/chat_view.ctmpl"
-#include "../static/embed.ctmpl"
-
-struct construct_message_args
-{
-    struct mstdnt_message* msg;
-    struct mstdnt_account* you;
-    struct mstdnt_account* them;
-    size_t msg_size; // Read messages backwards
-};
-
-struct construct_chats_args
-{
-    mastodont_t* api;
-    struct mstdnt_args* args;
-    struct mstdnt_chat* chats;
-};
-
-char* construct_chat(mastodont_t* api,
-                     struct mstdnt_args* m_args,
-                     struct mstdnt_chat* chat,
-                     size_t* size)
-{
-    char* result;
-    char* msg_id = NULL;
-    char* last_message = "<span class=\"empty-chat-text\">Chat created</span>";
-
-    // Get latest message
-    struct mstdnt_storage storage = { 0 };
-    struct mstdnt_message* messages = NULL;
-    size_t messages_len = 0;
-    
-    struct mstdnt_chats_args args = {
-        .with_muted = MSTDNT_TRUE,
-        .offset = 0,
-        .limit = 1,
-    };
-
-    if (mastodont_get_chat_messages(api, m_args, chat->id, &args, &storage,
-                                    &messages, &messages_len) == 0 && messages_len == 1)
-    {
-        last_message = messages[0].content;
-        msg_id = messages[0].id;
-    }
-    
-    struct chat_template data = {
-        .id = chat->id,
-        .prefix = config_url_prefix,
-        .acct = chat->account.acct,
-        .avatar = chat->account.avatar,
-        .display_name = chat->account.display_name,
-        .message_id = msg_id,
-        .last_message = last_message,
-    };
-    result = tmpl_gen_chat(&data, size);
-    mastodont_storage_cleanup(&storage);
-    // TODO cleanup messages
-    return result;
-}
-
-static char* construct_chat_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct construct_chats_args* args = passed;
-    return construct_chat(args->api, args->args, args->chats + index, res);
-}
-
-char* construct_chats(mastodont_t* api,
-                      struct mstdnt_args* m_args,
-                      struct mstdnt_chat* chats,
-                      size_t size,
-                      size_t* ret_size)
-{
-    struct construct_chats_args args = {
-        .api = api,
-        .args = m_args,
-        .chats = chats,
-    };
-            
-    return construct_func_strings(construct_chat_voidwrap, &args, size, ret_size);
-}
-
-char* construct_message(struct mstdnt_message* msg,
-                        struct mstdnt_account* you,
-                        struct mstdnt_account* them,
-                        size_t* size)
-{
-    char* result;
-    if (!(you && them)) return NULL;
-    int is_you = strcmp(you->id, msg->account_id) == 0;
-    struct message_template data = {
-        .id = msg->id,
-        .content = msg->content,
-        .is_you = is_you ? "message-you" : NULL,
-        .avatar = is_you ? you->avatar : them->avatar
-    };
-    result = tmpl_gen_message(&data, size);
-    return result;
-}
-
-static char* construct_message_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct construct_message_args* args = passed;
-    return construct_message(args->msg + (args->msg_size - index - 1), args->you, args->them, res);
-}
-
-char* construct_messages(struct mstdnt_message* messages,
-                         struct mstdnt_account* you,
-                         struct mstdnt_account* them,
-                         size_t size,
-                         size_t* ret_size)
-{
-    struct construct_message_args args = {
-        .msg = messages,
-        .you = you,
-        .them = them,
-        .msg_size = size
-    };
-    return construct_func_strings(construct_message_voidwrap, &args, size, ret_size);
-}
-
-char* construct_chats_view(char* lists_string, size_t* size)
-{
-    struct chats_page_template data = {
-        .content = lists_string,
-    };
-    return tmpl_gen_chats_page(&data, size);
-}
-
 void content_chats(PATH_ARGS)
 {
     struct mstdnt_args m_args;
diff --git a/src/conversations.h b/src/conversations.h
index 1cabc88..453897a 100644
--- a/src/conversations.h
+++ b/src/conversations.h
@@ -23,27 +23,6 @@
 #include <mastodont.h>
 #include "session.h"
 
-char* construct_chat(mastodont_t* api,
-                     struct mstdnt_args* m_args,
-                     struct mstdnt_chat* chat,
-                     size_t* size);
-char* construct_chats(mastodont_t* api,
-                      struct mstdnt_args* m_args,
-                      struct mstdnt_chat* chats,
-                      size_t size,
-                      size_t* ret_size);
-char* construct_chats_view(char* lists_string, size_t* size);
-// Message
-char* construct_message(struct mstdnt_message* message,
-                        struct mstdnt_account* your_profile,
-                        struct mstdnt_account* their_profile,
-                        size_t* size);
-char* construct_messages(struct mstdnt_message* message,
-                         struct mstdnt_account* your_profile,
-                         struct mstdnt_account* their_profile,
-                         size_t size,
-                         size_t* ret_size);
-
 void content_chats(PATH_ARGS);
 void content_chat_view(PATH_ARGS);
 
diff --git a/src/emoji.c b/src/emoji.c
index 5ab6d31..76132c6 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -24,11 +24,6 @@
 #include "easprintf.h"
 #include "string_helpers.h"
 
-// Pages
-#include "../static/emoji.ctmpl"
-#include "../static/emoji_plain.ctmpl"
-#include "../static/emoji_picker.ctmpl"
-
 enum emoji_categories
 {
     EMO_CAT_SMILEYS,
@@ -42,38 +37,6 @@ enum emoji_categories
     EMO_CAT_LEN
 };
 
-char* emojify(char* content, struct mstdnt_emoji* emos, size_t emos_len)
-{
-    if (!content) return NULL;
-    size_t sc_len;
-    char* oldres = NULL;
-    char* res = content;
-    char* emoji_url_str;
-    char* coloned;
-    for (size_t i = 0; i < emos_len; ++i)
-    {
-        oldres = res;
-
-        // Add colons around string
-        sc_len = strlen(emos[i].shortcode);
-        // 3 = \0 and two :
-        coloned = malloc(sc_len+3);
-        coloned[0] = ':';
-        strncpy(coloned + 1, emos[i].shortcode, sc_len);
-        coloned[sc_len+1] = ':';
-        coloned[sc_len+2] = '\0';
-
-        easprintf(&emoji_url_str, "<img class=\"emoji\" src=\"%s\" loading=\"lazy\">", emos[i].url);
-        
-        res = strrepl(res, coloned, emoji_url_str, STRREPL_ALL);
-        if (oldres != content && res != oldres) free(oldres);
-        // Cleanup
-        free(emoji_url_str);
-        free(coloned);
-    }
-    return res;
-}
-
 struct construct_emoji_picker_args
 {
     char* status_id;
@@ -84,21 +47,14 @@ char* construct_emoji(struct emoji_info* emoji, char* status_id, size_t* size)
 {
     if (!emoji)
         return NULL;
+    char* emoji_str;
 
     if (status_id)
-    {
-        struct emoji_template data = {
-            .status_id = status_id,
-            .emoji = emoji->codes
-        };
-        return tmpl_gen_emoji(&data, size);
-    }
-    else {
-        struct emoji_plain_template data = {
-            .emoji = emoji->codes
-        };
-        return tmpl_gen_emoji_plain(&data, size);
-    }
+        easprintf(&emoji_str, "<a href=\"/status/%s/react/%s\" class=\"emoji\">%s</a>",
+                  status_id, emoji->codes, emoji->codes);
+    else
+        easprintf(&emoji_str, "<span class=\"emoji\">%s</span>", emoji->codes);
+    return emoji_str;
 }
 
 static char* construct_emoji_voidwrap(void* passed, size_t index, size_t* res)
@@ -136,16 +92,17 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     };
     
     char* emojis[EMO_CAT_LEN];
+    size_t len[EMO_CAT_LEN];
 
     // TODO refactor to use #define lol
-    emojis[EMO_CAT_SMILEYS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_SMILEYS, EMOJO_CAT_ANIMALS - EMOJO_CAT_SMILEY, NULL);
-    emojis[EMO_CAT_ANIMALS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_ANIMALS, EMOJO_CAT_FOOD - EMOJO_CAT_ANIMALS, NULL);
-    emojis[EMO_CAT_FOOD] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FOOD, EMOJO_CAT_TRAVEL - EMOJO_CAT_FOOD, NULL);
-    emojis[EMO_CAT_TRAVEL] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_TRAVEL, EMOJO_CAT_ACTIVITIES - EMOJO_CAT_TRAVEL, NULL);
-    emojis[EMO_CAT_ACTIVITIES] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_ACTIVITIES, EMOJO_CAT_OBJECTS - EMOJO_CAT_ACTIVITIES, NULL);
-    emojis[EMO_CAT_OBJECTS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_OBJECTS, EMOJO_CAT_SYMBOLS - EMOJO_CAT_OBJECTS, NULL);
-    emojis[EMO_CAT_SYMBOLS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_SYMBOLS, EMOJO_CAT_FLAGS - EMOJO_CAT_SYMBOLS, NULL);
-    emojis[EMO_CAT_FLAGS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FLAGS, EMOJO_CAT_MAX - EMOJO_CAT_FLAGS, NULL);
+    emojis[EMO_CAT_SMILEYS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_SMILEYS, EMOJO_CAT_ANIMALS - EMOJO_CAT_SMILEY, len);
+    emojis[EMO_CAT_ANIMALS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_ANIMALS, EMOJO_CAT_FOOD - EMOJO_CAT_ANIMALS, len + 1);
+    emojis[EMO_CAT_FOOD] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FOOD, EMOJO_CAT_TRAVEL - EMOJO_CAT_FOOD, len + 2);
+    emojis[EMO_CAT_TRAVEL] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_TRAVEL, EMOJO_CAT_ACTIVITIES - EMOJO_CAT_TRAVEL, len + 3);
+    emojis[EMO_CAT_ACTIVITIES] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_ACTIVITIES, EMOJO_CAT_OBJECTS - EMOJO_CAT_ACTIVITIES, len + 4);
+    emojis[EMO_CAT_OBJECTS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_OBJECTS, EMOJO_CAT_SYMBOLS - EMOJO_CAT_OBJECTS, len + 5);
+    emojis[EMO_CAT_SYMBOLS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_SYMBOLS, EMOJO_CAT_FLAGS - EMOJO_CAT_SYMBOLS, len + 6);
+    emojis[EMO_CAT_FLAGS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FLAGS, EMOJO_CAT_MAX - EMOJO_CAT_FLAGS, len + 6);
     
     struct emoji_picker_template data = {
         .emojis_smileys = emojis[EMO_CAT_SMILEYS],
diff --git a/src/emoji.h b/src/emoji.h
index 31c81fc..44017c5 100644
--- a/src/emoji.h
+++ b/src/emoji.h
@@ -33,7 +33,6 @@ enum emoji_picker_cat
     EMOJI_CAT_FACES,
 };
 
-char* emojify(char* content, struct mstdnt_emoji* emos, size_t emos_len);
 char* construct_emoji(struct emoji_info* emoji, char* status_id, size_t* size);
 void content_emoji_picker(PATH_ARGS);
 char* construct_emoji_picker(char* status_id, size_t* size);

From 1b347848e8ff02a1cb5d35a454ea01be067c42a5 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 22 Aug 2022 01:08:35 +0000
Subject: [PATCH 111/143] Quit

FossilOrigin-Name: c62ed43b115d05ed5ceca3b258da63cbdd4081b3f034ff741f7b33e2d1f2daaa
---
 perl/emojis.pm            |   5 +-
 src/emoji.c               |  27 +++----
 src/emoji_reaction.c      |   4 -
 templates/emoji_picker.tt | 154 +++++++++++++++++++-------------------
 4 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/perl/emojis.pm b/perl/emojis.pm
index 73ca9c7..27acb38 100644
--- a/perl/emojis.pm
+++ b/perl/emojis.pm
@@ -24,8 +24,11 @@ sub generate_emoji
 
 sub emoji_picker
 {
-    my ($ssn, $data, $emojis) = @_;
+    my ($data, $emojis) = @_;
 
+    my %vars = (
+        e => $emojis
+        );
 
     to_template(\%vars, \$data->{'emoji_picker.tt'});
 }
diff --git a/src/emoji.c b/src/emoji.c
index 76132c6..b92dcb2 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -103,22 +103,23 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     emojis[EMO_CAT_OBJECTS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_OBJECTS, EMOJO_CAT_SYMBOLS - EMOJO_CAT_OBJECTS, len + 5);
     emojis[EMO_CAT_SYMBOLS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_SYMBOLS, EMOJO_CAT_FLAGS - EMOJO_CAT_SYMBOLS, len + 6);
     emojis[EMO_CAT_FLAGS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FLAGS, EMOJO_CAT_MAX - EMOJO_CAT_FLAGS, len + 6);
-    
-    struct emoji_picker_template data = {
-        .emojis_smileys = emojis[EMO_CAT_SMILEYS],
-        .emojis_animals = emojis[EMO_CAT_ANIMALS],
-        .emojis_food = emojis[EMO_CAT_FOOD],
-        .emojis_travel = emojis[EMO_CAT_TRAVEL],
-        .emojis_activities = emojis[EMO_CAT_ACTIVITIES],
-        .emojis_objects = emojis[EMO_CAT_OBJECTS],
-        .emojis_symbols = emojis[EMO_CAT_SYMBOLS],
-        .emojis_flags = emojis[EMO_CAT_FLAGS],
-    };
 
-    emoji_picker_html = tmpl_gen_emoji_picker(&data, size);
+    PERL_STACK_INIT;
+    XPUSHs(newRV_noinc((SV*)template_files));
+    AV* av = newAV();
+    for (int i = 0; i < EMO_CAT_LEN; ++i)
+    {
+        av_store(av, i, newSVpv(emojis + i, len + i));
+    }
+    XPUSHs(newRV_inc((SV*)av));
+    PERL_STACK_SCALAR_CALL("emojis::emoji_picker");
+
+    char* dup = PERL_GET_STACK_EXIT;
+
+    // Cleanup
     for (size_t i = 0; i < EMO_CAT_LEN; ++i)
         free(emojis[i]);
-    return emoji_picker_html;
+    return dup;
 }
 
 HV* perlify_emoji(struct mstdnt_emoji* const emoji)
diff --git a/src/emoji_reaction.c b/src/emoji_reaction.c
index 7e6bf65..62502ac 100644
--- a/src/emoji_reaction.c
+++ b/src/emoji_reaction.c
@@ -22,10 +22,6 @@
 #include <stdlib.h>
 #include "easprintf.h"
 
-// Templates
-#include "../static/custom_emoji_reaction.ctmpl"
-#include "../static/emoji_reaction.ctmpl"
-#include "../static/emoji_reactions.ctmpl"
 
 struct construct_emoji_reactions_args
 {
diff --git a/templates/emoji_picker.tt b/templates/emoji_picker.tt
index 70cd38a..f386c10 100644
--- a/templates/emoji_picker.tt
+++ b/templates/emoji_picker.tt
@@ -1,81 +1,81 @@
 <div class="emoji-picker">
-  <table class="tabs ui-table">
-    <tr>
-      <td>
-        <label for="cat-smileys">
-          <span class="tab-btn btn btn-alt">😃</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-animals">
-          <span class="tab-btn btn btn-alt">🐻</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-food">
-          <span class="tab-btn btn btn-alt">🍔</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-travel">
-          <span class="tab-btn btn btn-alt">🚀</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-activities">
-          <span class="tab-btn btn btn-alt">⚽</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-objects">
-          <span class="tab-btn btn btn-alt">🔧</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-symbols">
-          <span class="tab-btn btn btn-alt">🔢</span>
-        </label>
-      </td>
-      <td>
-        <label for="cat-flags">
-          <span class="tab-btn btn btn-alt">🎌</span>
-        </label>
-      </td>
-    </tr>
-  </table>
+    <table class="tabs ui-table">
+        <tr>
+            <td>
+                <label for="cat-smileys">
+                    <span class="tab-btn btn btn-alt">😃</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-animals">
+                    <span class="tab-btn btn btn-alt">🐻</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-food">
+                    <span class="tab-btn btn btn-alt">🍔</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-travel">
+                    <span class="tab-btn btn btn-alt">🚀</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-activities">
+                    <span class="tab-btn btn btn-alt">⚽</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-objects">
+                    <span class="tab-btn btn btn-alt">🔧</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-symbols">
+                    <span class="tab-btn btn btn-alt">🔢</span>
+                </label>
+            </td>
+            <td>
+                <label for="cat-flags">
+                    <span class="tab-btn btn btn-alt">🎌</span>
+                </label>
+            </td>
+        </tr>
+    </table>
 
-  <div class="emoji-picker-emojos-wrapper">
-    <input type="radio" class="hidden" id="cat-smileys" name="emoji-cat" checked>
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_smileys}}
+    <div class="emoji-picker-emojos-wrapper">
+        <input type="radio" class="hidden" id="cat-smileys" name="emoji-cat" checked>
+        <div class="emoji-picker-emojos">
+            [% e.0 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-animals" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.1 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-food" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.2 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-travel" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.3 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-activities" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.4 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-objects" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.5 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-symbols" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.6 %]
+        </div>
+        <input type="radio" class="hidden" id="cat-flags" name="emoji-cat">
+        <div class="emoji-picker-emojos">
+            [% e.7 %]
+        </div>
     </div>
-    <input type="radio" class="hidden" id="cat-animals" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_animals}}
-    </div>
-    <input type="radio" class="hidden" id="cat-food" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_food}}
-    </div>
-    <input type="radio" class="hidden" id="cat-travel" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_travel}}
-    </div>
-    <input type="radio" class="hidden" id="cat-activities" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_activities}}
-    </div>
-    <input type="radio" class="hidden" id="cat-objects" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_objects}}
-    </div>
-    <input type="radio" class="hidden" id="cat-symbols" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_symbols}}
-    </div>
-    <input type="radio" class="hidden" id="cat-flags" name="emoji-cat">
-    <div class="emoji-picker-emojos">
-      {{%s:emojis_flags}}
-    </div>
-  </div>
 </div>

From 50e76ae71277877202cceabf781ded30ce627389 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 22 Aug 2022 12:11:55 +0000
Subject: [PATCH 112/143] Restore filec compilation in makefiles

FossilOrigin-Name: a6559f6e98a925371e2c75272f054c4069c89437b9872c80d641d92b800aac37
---
 Makefile             | 12 +++++++--
 src/emoji_reaction.c | 60 --------------------------------------------
 src/emoji_reaction.h |  3 ---
 3 files changed, 10 insertions(+), 65 deletions(-)

diff --git a/Makefile b/Makefile
index 8157407..c3b4497 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,9 @@ LDFLAGS = -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpc
 SRC = $(wildcard src/*.c)
 OBJ = $(patsubst %.c,%.o,$(SRC))
 HEADERS = $(wildcard src/*.h) config.h
-PAGES_DIR = static
+TMPL_DIR = templates
+TMPLS = $(wildcard $(TMPL_DIR)/*.tt)
+TMPLS_C = $(patsubst %.tt,%.ctt,$(TMPLS))
 TEST_DIR = test/unit
 TESTS = $(wildcard $(TEST_DIR)/t*.c)
 UNIT_TESTS = $(patsubst %.c,%.bin,$(TESTS))
@@ -25,6 +27,7 @@ MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 all:
 	$(MAKE) dep_build
 	$(MAKE) filec
+	$(MAKE) make_tmpls
 	$(MAKE) $(TARGET)
 
 install_deps:
@@ -40,6 +43,11 @@ emojitoc: scripts/emoji-to.o
 	$(CC) -o emojitoc $< $(LDFLAGS)
 	./emojitoc meta/emoji.json > src/emoji_codes.h
 
+$(TMPL_DIR)/%.ctt: $(TMPL_DIR)/%.tt
+	./filec $< data_$(notdir $*)_tt > $@
+
+make_tmpls: $(TMPLS_C)
+
 $(MASTODONT_DIR): 
 	cd ..; fossil clone $(MASTODONT_URL) || true
 	cd treebird; ln -s ../mastodont-c .
@@ -66,7 +74,7 @@ dep_build:
 
 clean:
 	rm -f $(OBJ) src/file-to-c/main.o
-	rm -f $(PAGES_CMP)
+	rm -f $(TMPLS_C)
 	rm -f test/unit/*.bin
 	rm -f filec ctemplate
 	rm $(TARGET) || true
diff --git a/src/emoji_reaction.c b/src/emoji_reaction.c
index 62502ac..d73aecd 100644
--- a/src/emoji_reaction.c
+++ b/src/emoji_reaction.c
@@ -22,66 +22,6 @@
 #include <stdlib.h>
 #include "easprintf.h"
 
-
-struct construct_emoji_reactions_args
-{
-    struct mstdnt_emoji_reaction* emojis;
-    char* id;
-};
-
-char* construct_emoji_reaction(char* id, struct mstdnt_emoji_reaction* emo, size_t* str_size)
-{
-    char* ret;
-    char* emoji = emo->name;
-    if (emo->url)
-    {
-        struct custom_emoji_reaction_template c_data = {
-            .url = emo->url,
-        };
-        emoji = tmpl_gen_custom_emoji_reaction(&c_data, NULL);
-    }
-    
-    struct emoji_reaction_template data = {
-        .prefix = config_url_prefix,
-        .status_id = id,
-        .custom_emoji = emo->url ? "custom-emoji-container" : NULL,
-        .emoji = emo->name,
-        .emoji_display = emoji,
-        .emoji_active = emo->me ? "active" : NULL,
-        .emoji_count = emo->count
-    };
-
-    ret = tmpl_gen_emoji_reaction(&data, str_size);
-    if (emoji != emo->name)
-        free(emoji);
-    return ret;
-}
-
-static char* construct_emoji_reactions_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct construct_emoji_reactions_args* args = passed;
-    return construct_emoji_reaction(args->id, args->emojis + index, res);
-}
-
-char* construct_emoji_reactions(char* id, struct mstdnt_emoji_reaction* emos, size_t emos_len, size_t* str_size)
-{
-    size_t elements_size;
-    struct construct_emoji_reactions_args args = {
-        .emojis = emos,
-        .id = id
-    };
-    char* elements = construct_func_strings(construct_emoji_reactions_voidwrap, &args, emos_len, &elements_size);
-    char* emos_view;
-
-    struct emoji_reactions_template data = {
-        .emojis = elements
-    };
-    emos_view = tmpl_gen_emoji_reactions(&data, str_size);
-    // Cleanup
-    free(elements);
-    return emos_view;
-}
-
 HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji)
 {
     if (!emoji) return NULL;
diff --git a/src/emoji_reaction.h b/src/emoji_reaction.h
index bd7f12c..bacaa14 100644
--- a/src/emoji_reaction.h
+++ b/src/emoji_reaction.h
@@ -21,9 +21,6 @@
 #include <mastodont.h>
 #include "global_perl.h"
 
-char* construct_emoji_reaction(char* id, struct mstdnt_emoji_reaction* emo, size_t* str_len);
-char* construct_emoji_reactions(char* id, struct mstdnt_emoji_reaction* emos, size_t emos_len, size_t* str_len);
-
 // Perl
 HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji);
 AV* perlify_emoji_reactions(struct mstdnt_emoji_reaction* const emos, size_t len);

From 09ddb21d425de9ae76cc08e74dfe0ba49d9962a1 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 22 Aug 2022 13:50:23 +0000
Subject: [PATCH 113/143] Finish cleaning up template stuff

FossilOrigin-Name: 1fa9a720bfca80c96264c4f7263f6de710bee40da23d92f874070de5f32412a7
---
 src/account.c       |  31 ---
 src/account.h       |   2 -
 src/emoji.c         |   2 +-
 src/error.c         |  36 +--
 src/error.h         |   8 -
 src/graphsnbars.c   | 121 ---------
 src/graphsnbars.h   |  32 ---
 src/hashtag.c       |  37 ---
 src/hashtag.h       |   3 +-
 src/lists.c         |   4 -
 src/login.c         |   6 +-
 src/navigation.c    |  43 ----
 src/navigation.h    |  29 ---
 src/notifications.c | 160 ------------
 src/notifications.h |  21 --
 src/page_config.c   |   5 -
 src/reply.c         | 183 --------------
 src/reply.h         |  34 ---
 src/scrobble.c      |  49 ++--
 src/scrobble.h      |   5 +-
 src/search.c        |  36 ---
 src/search.h        |  12 -
 src/status.c        | 585 +-------------------------------------------
 src/status.h        |  51 +---
 src/timeline.c      |   5 -
 src/type_string.c   |  67 -----
 src/type_string.h   |  28 ---
 27 files changed, 38 insertions(+), 1557 deletions(-)
 delete mode 100644 src/graphsnbars.c
 delete mode 100644 src/graphsnbars.h
 delete mode 100644 src/navigation.c
 delete mode 100644 src/navigation.h
 delete mode 100644 src/reply.c
 delete mode 100644 src/reply.h
 delete mode 100644 src/type_string.c
 delete mode 100644 src/type_string.h

diff --git a/src/account.c b/src/account.c
index 432b897..5c67bf7 100644
--- a/src/account.c
+++ b/src/account.c
@@ -31,7 +31,6 @@
 #include "base_page.h"
 #include "scrobble.h"
 #include "string_helpers.h"
-#include "navigation.h"
 #include "emoji.h"
 #include "timeline.h"
 
@@ -504,36 +503,6 @@ AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len)
     return av;
 }
 
-HV* perlify_scrobble(const struct mstdnt_scrobble* scrobble)
-{
-    if (!scrobble) return NULL;
-    HV* scrobble_hv = newHV();
-
-    hvstores_ref(scrobble_hv, "account", perlify_account(&(scrobble->account)));
-    hvstores_str(scrobble_hv, "album", scrobble->album);
-    hvstores_str(scrobble_hv, "artist", scrobble->artist);
-    hvstores_int(scrobble_hv, "created_at", scrobble->created_at);
-    hvstores_str(scrobble_hv, "id", scrobble->id);
-    hvstores_int(scrobble_hv, "length", scrobble->length);
-    hvstores_str(scrobble_hv, "title", scrobble->title);
-    
-    return scrobble_hv;
-}
-
-AV* perlify_scrobbles(const struct mstdnt_scrobble* scrobbles, size_t len)
-{
-    if (!(scrobbles && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_scrobble(scrobbles + i)));
-    }
-
-    return av;
-}
-
 HV* perlify_account(const struct mstdnt_account* acct)
 {
     if (!acct) return NULL;
diff --git a/src/account.h b/src/account.h
index 6ba8c47..97876b4 100644
--- a/src/account.h
+++ b/src/account.h
@@ -72,8 +72,6 @@ void content_account_bookmarks(PATH_ARGS);
 
 HV* perlify_account(const struct mstdnt_account* acct);
 AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len);
-HV* perlify_scrobble(const struct mstdnt_scrobble* scrobble);
-AV* perlify_scrobbles(const struct mstdnt_scrobble* scrobbles, size_t len);
 HV* perlify_relationship(const struct mstdnt_relationship* rel);
 
 #endif // ACCOUNT_H
diff --git a/src/emoji.c b/src/emoji.c
index b92dcb2..e065296 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -109,7 +109,7 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     AV* av = newAV();
     for (int i = 0; i < EMO_CAT_LEN; ++i)
     {
-        av_store(av, i, newSVpv(emojis + i, len + i));
+        av_store(av, i, newSVpv(emojis[i], len[i]));
     }
     XPUSHs(newRV_inc((SV*)av));
     PERL_STACK_SCALAR_CALL("emojis::emoji_picker");
diff --git a/src/error.c b/src/error.c
index f730d1a..679e14e 100644
--- a/src/error.c
+++ b/src/error.c
@@ -21,46 +21,12 @@
 #include "easprintf.h"
 #include "l10n.h"
 
-// Pages
-#include "../static/error_404.ctmpl"
-#include "../static/error.ctmpl"
-
-char* construct_error(const char* error, enum error_type type, unsigned pad, size_t* size)
-{
-    char* class;
-
-    switch (type)
-    {
-    case E_ERROR:
-        class = "error"; break;
-    case E_WARNING:
-        class = "warning"; break;
-    case E_NOTICE:
-        class = "notice"; break;
-    }
-
-    struct error_template data = {
-        .err_type = class,
-        .is_padded = pad ? "error-pad" : NULL,
-        .error = error ? error : "An error occured",
-    };
-    
-    return tmpl_gen_error(&data, size);
-}
-
 void content_not_found(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* path)
 {
-    char* page;
-    struct error_404_template data = {
-        .error = L10N[L10N_EN_US][L10N_PAGE_NOT_FOUND]
-    };
-    page = tmpl_gen_error_404(&data, NULL);
-    
     struct base_page b = {
-        .content = page,
+        .content = "Content not found",
         .sidebar_left = NULL
     };
 
     render_base_page(&b, req, ssn, api);
-    free(page);
 }
diff --git a/src/error.h b/src/error.h
index cb6fb72..cde3547 100644
--- a/src/error.h
+++ b/src/error.h
@@ -23,14 +23,6 @@
 #include "session.h"
 #include "path.h"
 
-enum error_type
-{
-    E_ERROR,
-    E_WARNING,
-    E_NOTICE
-};
-
-char* construct_error(const char* error, enum error_type type, unsigned pad, size_t* size);
 void content_not_found(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* path);
 
 #endif // ERROR_H
diff --git a/src/graphsnbars.c b/src/graphsnbars.c
deleted file mode 100644
index ea717a1..0000000
--- a/src/graphsnbars.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <string.h>
-#include <time.h>
-#include "graphsnbars.h"
-#include "easprintf.h"
-#include "string_helpers.h"
-
-// Pages
-#include "../static/bar.ctmpl"
-#include "../static/bar_graph.ctmpl"
-
-struct hashtags_graph_args
-{
-    struct mstdnt_tag* tags;
-    size_t tags_len;
-    unsigned max;
-    time_t rel_day;
-    size_t days;
-};
-
-char* construct_bar_graph_container(char* bars, size_t* size)
-{
-    struct bar_graph_template data = {
-        .graph = bars,
-    };
-    return tmpl_gen_bar_graph(&data, size);
-}
-
-char* construct_bar(float value, size_t* size)
-{
-    struct bar_template data = {
-        .value = value * 100
-    };
-    return tmpl_gen_bar(&data, size);
-}
-
-static char* construct_hashgraph_voidwrap(void* passed, size_t index, size_t* res)
-{
-    unsigned curr_sum = 0;
-    struct hashtags_graph_args* args = passed;
-    struct mstdnt_tag* tags = args->tags;
-    size_t tags_len = args->tags_len;
-    unsigned max = args->max;
-    time_t rel_day = args->rel_day;
-    size_t days = args->days;
-
-    for (int i = 0; i < tags_len; ++i)
-    {
-        for (int j = 0; j < tags[i].history_len; ++j)
-        {
-            if (tags[i].history[j].day == rel_day-((days-index-1)*86400))
-                curr_sum += tags[i].history[j].uses;
-        }
-    }
-    
-    return construct_bar((float)curr_sum / max, res);
-}
-
-char* construct_hashtags_graph(struct mstdnt_tag* tags,
-                               size_t tags_len,
-                               size_t days,
-                               size_t* ret_size)
-{
-    unsigned max_sum = 0;
-    unsigned curr_sum = 0;
-    size_t max_history_len = 0;
-
-    // Get current time at midnight for basis, copy over
-    time_t t = time(NULL);
-    struct tm* mn_ptr = gmtime(&t);
-    struct tm mn;
-    memcpy(&mn, mn_ptr, sizeof(mn));
-    mn.tm_hour = 0;
-    mn.tm_min = 0;
-    mn.tm_sec = 0;
-    time_t rel_day = timegm(&mn);
-
-    // Run a loop through all the hashtags, sum each set up,
-    // then get the largest sum
-    for (size_t i = 0; i < days; ++i)
-    {
-        for (size_t j = 0; j < tags_len && i < tags[j].history_len; ++j)
-        {
-            if (tags[j].history_len > max_history_len)
-                max_history_len = tags[j].history_len;
-            if (tags[j].history[i].day >= rel_day-(i*86400))
-                curr_sum += tags[j].history[i].uses;
-        }
-
-        if (curr_sum > max_sum)
-            max_sum = curr_sum;
-        curr_sum = 0;
-    }
-    
-    struct hashtags_graph_args args = {
-        .tags = tags,
-        .tags_len = tags_len,
-        .max = max_sum,
-        .rel_day = rel_day,
-        .days = max_history_len,
-    };
-
-    return construct_func_strings(construct_hashgraph_voidwrap, &args, max_history_len, ret_size);
-}
diff --git a/src/graphsnbars.h b/src/graphsnbars.h
deleted file mode 100644
index 344be91..0000000
--- a/src/graphsnbars.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef GRAPHS_N_BARS_H
-#define GRAPHS_N_BARS_H
-#include <stddef.h>
-#include <mastodont.h>
-#include "session.h"
-
-char* construct_bar_graph_container(char* bars, size_t* size);
-char* construct_bar(float value, size_t* size);
-char* construct_hashtags_graph(struct mstdnt_tag* tags,
-                               size_t tags_len,
-                               size_t days,
-                               size_t* ret_size);
-
-#endif /* GRAPHS_N_BARS_H */
diff --git a/src/hashtag.c b/src/hashtag.c
index 2e44e33..8bdc886 100644
--- a/src/hashtag.c
+++ b/src/hashtag.c
@@ -22,44 +22,7 @@
 #include "easprintf.h"
 #include "../config.h"
 
-// Pages
-#include "../static/hashtag.ctmpl"
-#include "../static/hashtag_page.ctmpl"
 
 #define TAG_SIZE_INITIAL 12
 
-static unsigned hashtag_history_daily_uses(size_t max, struct mstdnt_history* history, size_t history_len)
-{
-    unsigned total = 0;
-
-    for (int i = 0; i < history_len && i < max; ++i)
-        total += history[i].uses;
-    
-    return total;
-}
-
-char* construct_hashtag(struct mstdnt_tag* hashtag, size_t* size)
-{
-    // Lol!
-    unsigned hash_size = TAG_SIZE_INITIAL +
-        CLAMP(hashtag_history_daily_uses(7, hashtag->history, hashtag->history_len)*2, 0, 42);
-
-    struct hashtag_template data = {
-        .prefix = config_url_prefix,
-        .tag = hashtag->name,
-        .tag_size = hash_size,
-    };
-    return tmpl_gen_hashtag(&data, size);
-}
-
-static char* construct_hashtag_voidwrap(void* passed, size_t index, size_t* res)
-{
-    return construct_hashtag((struct mstdnt_tag*)passed + index, res);
-}
-
-char* construct_hashtags(struct mstdnt_tag* hashtags, size_t size, size_t* ret_size)
-{
-    if (!(hashtags && size)) return NULL;
-    return construct_func_strings(construct_hashtag_voidwrap, hashtags, size, ret_size);
-}
 
diff --git a/src/hashtag.h b/src/hashtag.h
index cbf2992..fb6f431 100644
--- a/src/hashtag.h
+++ b/src/hashtag.h
@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <mastodont.h>
 
-char* construct_hashtag(struct mstdnt_tag* hashtag, size_t* size);
-char* construct_hashtags(struct mstdnt_tag* hashtags, size_t size, size_t* ret_size);
+// TODO?
 
 #endif /* HASHTAG_H */
diff --git a/src/lists.c b/src/lists.c
index ce24f34..225133c 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -29,10 +29,6 @@
 #include "lists.h"
 #include "string_helpers.h"
 #include "http.h"
-// Files
-#include "../static/account.ctmpl"
-#include "../static/list.ctmpl"
-#include "../static/lists.ctmpl"
 
 void content_lists(PATH_ARGS)
 {
diff --git a/src/login.c b/src/login.c
index 9a09c82..4c3f5fd 100644
--- a/src/login.c
+++ b/src/login.c
@@ -29,8 +29,6 @@
 #include <curl/curl.h>
 #include <fcgi_stdio.h>
 
-// Files
-#include "../static/login.ctmpl"
 
 #define LOGIN_SCOPE "read+write+follow+push"
 
@@ -163,7 +161,7 @@ void content_login(PATH_ARGS)
 
         if (mastodont_register_app(api, &m_args, &args_app, &storage, &app) != 0)
         {
-            error = construct_error(oauth_store.error, E_ERROR, 1, NULL);
+//            error = construct_error(oauth_store.error, E_ERROR, 1, NULL);
         }
         else {
             struct mstdnt_application_args args_token = {
@@ -183,7 +181,7 @@ void content_login(PATH_ARGS)
                                              &oauth_store,
                                              &token) != 0 && oauth_store.error)
             {
-                error = construct_error(oauth_store.error, E_ERROR, 1, NULL);
+                //error = construct_error(oauth_store.error, E_ERROR, 1, NULL);
             }
             else {
                 if (url_link)
diff --git a/src/navigation.c b/src/navigation.c
deleted file mode 100644
index fe45f2b..0000000
--- a/src/navigation.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <string.h>
-#include "navigation.h"
-#include "easprintf.h"
-
-// Pages
-#include "../static/navigation.ctmpl"
-
-#define SUBMIT_HTML "<input type=\"submit\" class=\"hidden\">"
-
-char* construct_navigation_box(char* start_id,
-                               char* prev_id,
-                               char* next_id,
-                               size_t* size)
-{
-    int is_start = start_id && prev_id ? strcmp(start_id, prev_id) == 0 : 0;
-
-    struct navigation_template tdata = {
-        .start_id = start_id,
-        .min_id = prev_id,
-        .prev_active = is_start ? "btn-disabled" : NULL,
-        .prev_submit = is_start ? "" : SUBMIT_HTML,
-        .max_id = next_id
-    };
-    return tmpl_gen_navigation(&tdata, size);
-}
diff --git a/src/navigation.h b/src/navigation.h
deleted file mode 100644
index e15901b..0000000
--- a/src/navigation.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef NAVIGATION_H
-#define NAVIGATION_H
-#include <stddef.h>
-#include <mastodont.h>
-
-char* construct_navigation_box(char* start_id,
-                               char* prev_id,
-                               char* next_id,
-                               size_t* size);
-
-#endif // NAVIGATION_H
diff --git a/src/notifications.c b/src/notifications.c
index 3c4418c..e5bdf9d 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -25,7 +25,6 @@
 #include "base_page.h"
 #include "string_helpers.h"
 #include "easprintf.h"
-#include "navigation.h"
 #include "http.h"
 #include "status.h"
 #include "error.h"
@@ -33,165 +32,6 @@
 #include "account.h"
 #include "../config.h"
 
-// Pages
-#include "../static/notifications_page.ctmpl"
-#include "../static/notifications.ctmpl"
-#include "../static/notification_action.ctmpl"
-#include "../static/notification.ctmpl"
-#include "../static/notification_compact.ctmpl"
-#include "../static/like_svg.ctmpl"
-#include "../static/repeat_svg.ctmpl"
-#include "../static/notifications_embed.ctmpl"
-
-struct notification_args
-{
-    struct session* ssn;
-    mastodont_t* api;
-    struct mstdnt_notification* notifs;
-};
-
-char* construct_notification(struct session* ssn,
-                             mastodont_t* api,
-                             struct mstdnt_notification* notif,
-                             size_t* size)
-{
-    char* notif_html;
-
-    if (notif->status)
-    {
-        // Construct status with notification_info
-        notif_html = construct_status(ssn, api, notif->status, size, notif, NULL, 0);
-    }
-    else {
-        notif_html = construct_notification_action(notif, size);
-    }
-
-    return notif_html;
-}
-
-char* construct_notification_action(struct mstdnt_notification* notif, size_t* size)
-{
-    char* res;
-    char* serialized_display_name = sanitize_html(notif->account->display_name);
-    char* display_name = emojify(serialized_display_name,
-                                 notif->account->emojis,
-                                 notif->account->emojis_len);
-    struct notification_action_template tdata = {
-        .avatar = notif->account->avatar,
-        .acct = notif->account->acct,
-        .display_name = display_name,
-        .prefix = config_url_prefix,
-        .action = notification_type_compact_str(notif->type),
-        .notif_svg = notification_type_svg(notif->type)
-    };
-    res = tmpl_gen_notification_action(&tdata, size);
-    /* // Cleanup */
-    if (display_name != notif->account->display_name &&
-        display_name != serialized_display_name)
-        free(display_name);
-    if (serialized_display_name != notif->account->display_name)
-        free(serialized_display_name);
-    return res;
-}
-
-char* construct_notification_compact(struct session* ssn,
-                                     mastodont_t* api,
-                                     struct mstdnt_notification* notif,
-                                     size_t* size)
-{
-    char* notif_html;
-    char* status_format = NULL;
-    char* notif_stats = NULL;
-
-    const char* type_str = notification_type_compact_str(notif->type);
-    const char* type_svg = notification_type_svg(notif->type);
-
-    if (notif->status)
-    {
-        if (notif->type == MSTDNT_NOTIFICATION_MENTION)
-            notif_stats = construct_interaction_buttons(ssn, notif->status, NULL,
-                                                        STATUS_NO_LIKEBOOST | STATUS_NO_DOPAMEME);
-        status_format = reformat_status(ssn,
-                                        notif->status->content,
-                                        notif->status->emojis,
-                                        notif->status->emojis_len);
-    }
-
-    char* serialized_display_name = sanitize_html(notif->account->display_name);
-    char* display_name = emojify(serialized_display_name,
-                                 notif->account->emojis,
-                                 notif->account->emojis_len);
-    struct notification_compact_template tdata = {
-        .avatar = notif->account->avatar,
-        .has_icon = strlen(type_svg) == 0 ? "" : "-with-icon",
-        .acct = notif->account->acct,
-        .display_name = display_name,
-        .action = type_str,
-        .notif_svg = type_svg,
-        .is_status = (notif->type == MSTDNT_NOTIFICATION_STATUS ||
-                      notif->type == MSTDNT_NOTIFICATION_MENTION ? "is-mention" : NULL),
-        /* Might show follower address */
-        .content = (notif->type == MSTDNT_NOTIFICATION_FOLLOW ?
-                   notif->account->acct : status_format),
-        .stats = notif_stats
-    };
-
-    notif_html = tmpl_gen_notification_compact(&tdata, size);
-
-    if (status_format &&
-        status_format != notif->status->content) free(status_format);
-    if (notif_stats) free(notif_stats);
-    if (serialized_display_name != notif->account->display_name)
-        free(serialized_display_name);
-    if (display_name != notif->account->display_name &&
-        display_name != serialized_display_name)
-        free(display_name);
-    return notif_html;
-}
-
-static char* construct_notification_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct notification_args* args = passed;
-    return construct_notification(args->ssn, args->api, args->notifs + index, res);
-}
-
-static char* construct_notification_compact_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct notification_args* args = passed;
-    return construct_notification_compact(args->ssn, args->api, args->notifs + index, res);
-}
-
-char* construct_notifications(struct session* ssn,
-                              mastodont_t* api,
-                              struct mstdnt_notification* notifs,
-                              size_t size,
-                              size_t* ret_size)
-{
-    struct notification_args args = {
-        .ssn = ssn,
-        .api = api,
-        .notifs = notifs
-    };
-    return construct_func_strings(construct_notification_voidwrap, &args, size, ret_size);
-}
-
-char* construct_notifications_compact(struct session* ssn,
-                                      mastodont_t* api,
-                                      struct mstdnt_notification* notifs,
-                                      size_t size,
-                                      size_t* ret_size)
-{
-    struct notification_args args = {
-        .ssn = ssn,
-        .api = api,
-        .notifs = notifs
-    };
-    return construct_func_strings(construct_notification_compact_voidwrap,
-                                  &args,
-                                  size,
-                                  ret_size);
-}
-
 void content_notifications(PATH_ARGS)
 {
     struct mstdnt_args m_args;
diff --git a/src/notifications.h b/src/notifications.h
index 9ceed69..8df3ab5 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -23,29 +23,8 @@
 #include <fcgiapp.h>
 #include "session.h"
 #include "path.h"
-#include "type_string.h"
 #include "global_perl.h"
 
-char* construct_notification(struct session* ssn,
-                             mastodont_t* api,
-                             struct mstdnt_notification* notif,
-                             size_t* size);
-char* construct_notification_action(struct mstdnt_notification* notif, size_t* size);
-char* construct_notification_compact(struct session* ssn,
-                                     mastodont_t* api,
-                                     struct mstdnt_notification* notif,
-                                     size_t* size);
-char* construct_notifications(struct session* ssn,
-                              mastodont_t* api,
-                              struct mstdnt_notification* notifs,
-                              size_t size,
-                              size_t* ret_size);
-char* construct_notifications_compact(struct session* ssn,
-                                      mastodont_t* api,
-                                      struct mstdnt_notification* notifs,
-                                      size_t size,
-                                      size_t* ret_size);
-
 // Page contents
 void content_notifications(PATH_ARGS);
 void content_notifications_compact(PATH_ARGS);
diff --git a/src/page_config.c b/src/page_config.c
index f7022c0..6e35af7 100644
--- a/src/page_config.c
+++ b/src/page_config.c
@@ -31,11 +31,6 @@
 #include "l10n.h"
 #include <fcgi_stdio.h>
 
-// Pages
-#include "../static/config_general.ctmpl"
-#include "../static/config_appearance.ctmpl"
-#include "../static/config_sidebar.ctmpl"
-
 #define bool_checked(key) (ssn->config.key ? "checked" : "")
 
 enum config_category
diff --git a/src/reply.c b/src/reply.c
deleted file mode 100644
index 7203cde..0000000
--- a/src/reply.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#define PCRE2_CODE_UNIT_WIDTH 8
-
-#include <pcre2.h>
-#include <stdlib.h>
-#include <string.h>
-#include "reply.h"
-#include "easprintf.h"
-#include "../config.h"
-
-// Pages
-#include "../static/post.ctmpl"
-
-#define ID_REPLY_SIZE 256
-#define ID_RESPONSE "<input type=\"hidden\" name=\"replyid\" value=\"%s\">"
-
-char* construct_post_box(struct mstdnt_status* reply_status,
-                         char* default_content,
-                         size_t* size)
-{
-#define C_S "checked"
-#define D_S "disabled"
-    char* reply_html;
-    char id_reply[ID_REPLY_SIZE];
-    enum mstdnt_visibility_type vis = MSTDNT_VISIBILITY_PUBLIC;
-    
-    // Put hidden post request and check visibility
-    if (reply_status)
-    {
-        snprintf(id_reply, ID_REPLY_SIZE, ID_RESPONSE, reply_status->id);
-        vis = reply_status->visibility;
-    }
-
-    /* 
-     * Mastodont-c orders the visibility type from smallest (PUBLIC) to 
-     * largest (LOCAL), so we take advantage of the enum values
-     */
-    struct post_template tdata = {
-        .prefix = config_url_prefix,
-        .reply_input = reply_status ? id_reply : NULL,
-        .content = default_content,
-        .public_checked = vis == MSTDNT_VISIBILITY_PUBLIC ? C_S : NULL,
-        // You can reply with public to unlisted posts
-        .public_disabled = vis > MSTDNT_VISIBILITY_UNLISTED ? D_S : NULL,
-        .unlisted_checked = vis == MSTDNT_VISIBILITY_UNLISTED ? C_S : NULL,
-        .unlisted_disabled = vis > MSTDNT_VISIBILITY_UNLISTED ? D_S : NULL,
-        .private_checked = vis == MSTDNT_VISIBILITY_PRIVATE ? C_S : NULL,
-        .private_disabled = vis > MSTDNT_VISIBILITY_PRIVATE ? D_S : NULL,
-        .direct_checked = vis == MSTDNT_VISIBILITY_DIRECT ? C_S : NULL,
-        .local_checked = vis == MSTDNT_VISIBILITY_LOCAL ? C_S : NULL,
-    };
-    return tmpl_gen_post(&tdata, size);
-}
-
-/* Some comments:
- *  - Misskey does not return <span>, but we still regex to make sure it's a highlight
- *  - The order of parameters in a tag can be changed (mastodon does this),
- *    so we just grep for regex href
- *  - Misskey/Mastodon adds an @ symbol in the href param, while pleroma adds /users and honk adds /u
- */
-#define REGEX_REPLY "<a .*?href=\"https?:\\/\\/(.*?)\\/(?:@|users/|u/)?(.*?)?\".*?>@(?:<span>)?.*?(?:<\\/span>)?"
-
-char* reply_status(struct session* ssn, char* id, struct mstdnt_status* status)
-{
-    char* content = status->content;
-    size_t content_len = strlen(status->content);
-    char* stat_reply;
-    // Regex
-    pcre2_code* re;
-    PCRE2_SIZE* re_results;
-    pcre2_match_data* re_data;
-    // Regex data
-    int rc;
-    int error;
-    PCRE2_SIZE erroffset;
-    int url_off, url_len, name_off, name_len;
-    // Replies
-    size_t replies_size = 0, replies_size_orig;
-    char* replies = NULL;
-    char* instance_domain = malloc(sizeof(config_instance_url)+sizeof("https:///")+1);
-
-    // sscanf instead of regex works here and requires less work, we just need to trim off the slash at the end
-    if (sscanf(config_instance_url, "https://%s/", instance_domain) == 0)
-        if (sscanf(config_instance_url, "http://%s/", instance_domain) == 0)
-        {
-            free(instance_domain);
-            return NULL;
-        }
-
-    instance_domain[strlen(instance_domain)] = '\0';
-    // Remove ports, if any. Needed for development or if
-    //  the server actually supports these
-    char* port_val = strchr(instance_domain, ':');
-    if (port_val) *port_val = '\0';
-
-    // Load first reply
-    if (ssn->logged_in && strcmp(status->account.acct, ssn->acct.acct) != 0)
-    {
-        replies = malloc(replies_size = strlen(status->account.acct)+2);
-        replies[0] = '@';
-        strcpy(replies+1, status->account.acct);
-        replies[replies_size-1] = ' ';
-    }
-
-    // Compile regex
-    re = pcre2_compile((PCRE2_SPTR)REGEX_REPLY, PCRE2_ZERO_TERMINATED, 0, &error, &erroffset, NULL);
-    if (re == NULL)
-    {
-        fprintf(stderr, "Couldn't parse regex at offset %ld: %d\n", erroffset, error);
-        free(replies);
-        pcre2_code_free(re);
-    }
-
-    re_data = pcre2_match_data_create_from_pattern(re, NULL);
-
-    for (int ind = 0;;)
-    {
-        rc = pcre2_match(re, (PCRE2_SPTR)content, content_len, ind, 0, re_data, NULL);
-        if (rc < 0)
-            break;
-
-        re_results = pcre2_get_ovector_pointer(re_data);
-
-        // Store to last result
-        ind = re_results[5];
-
-        // Read out
-        url_off = re_results[2];
-        url_len = re_results[3] - url_off;
-        name_off = re_results[4];
-        name_len = re_results[5] - name_off;
-
-        int instance_cmp = strncmp(instance_domain, content+url_off, url_len);
-        // Is this the same as us?
-        // Cut off url_len by one to slice the '/' at the end
-        if (instance_cmp == 0 &&
-            strncmp(ssn->acct.acct, content+name_off, name_len) == 0)
-            continue;
-        
-        replies_size_orig = replies_size;
-        replies_size += (instance_cmp!=0?url_len:0)+name_len+3-(instance_cmp==0); // Bool as int :^)
-
-        // Realloc string
-        replies = realloc(replies, replies_size+1);
-
-        replies[replies_size_orig] = '@';
-        memcpy(replies + replies_size_orig + 1, content + name_off, name_len);
-        if (instance_cmp != 0)
-        {
-            replies[replies_size_orig+1+name_len] = '@';
-            memcpy(replies + replies_size_orig + 1 + name_len + 1, content + url_off, url_len);
-        }
-        replies[replies_size-1] = ' ';
-    }
-
-    if (replies)
-        replies[replies_size-1] = '\0';
-
-    pcre2_match_data_free(re_data);
-    
-    stat_reply = construct_post_box(status, replies, NULL);
-    pcre2_code_free(re);
-    free(replies);
-    free(instance_domain);
-    return stat_reply;
-}
diff --git a/src/reply.h b/src/reply.h
deleted file mode 100644
index b01c6be..0000000
--- a/src/reply.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef REPLY_H
-#define REPLY_H
-#include "session.h"
-#include <stddef.h>
-#include <mastodont.h>
-
-char* construct_post_box(struct mstdnt_status* reply_id,
-                         char* default_content,
-                         size_t* size);
-
-char* reply_status(struct session* ssn,
-                   char* id,
-                   struct mstdnt_status* status);
-
-
-#endif // REPLY_H
diff --git a/src/scrobble.c b/src/scrobble.c
index eb0aab1..c6a2040 100644
--- a/src/scrobble.c
+++ b/src/scrobble.c
@@ -19,35 +19,36 @@
 #include "scrobble.h"
 #include "easprintf.h"
 #include "string_helpers.h"
+#include "account.h"
 
-#include "../static/scrobble.ctmpl"
-
-char* construct_scrobble(struct mstdnt_scrobble* scrobble, size_t* size)
+// Converts it into a perl struct
+HV* perlify_scrobble(struct mstdnt_scrobble* scrobble)
 {
-    struct scrobble_template tdata = {
-        .scrobble_id = scrobble->id,
-        .avatar = scrobble->account.avatar,
-        .username = scrobble->account.display_name,
-        .activity = "is listening to...",
-        .title_key = "Title",
-        .title = scrobble->title,
-        .artist_key = "Artist",
-        .artist = scrobble->artist,
-        .album_key = "Album",
-        .album = scrobble->album,
-        .length_key = "Duration",
-        .length = scrobble->length
-    };
+    if (!scrobble) return NULL;
+    HV* scrobble_hv = newHV();
 
-    return tmpl_gen_scrobble(&tdata, size);
+    hvstores_str(scrobble_hv, "album", scrobble->album);
+    hvstores_str(scrobble_hv, "artist", scrobble->artist);
+    hvstores_str(scrobble_hv, "id", scrobble->id);
+    hvstores_str(scrobble_hv, "title", scrobble->title);
+    hvstores_int(scrobble_hv, "created_at", scrobble->created_at);
+    hvstores_int(scrobble_hv, "length", scrobble->created_at);
+    hvstores_ref(scrobble_hv, "account", perlify_account(&(scrobble->account)));
+    
+    return scrobble_hv;
 }
 
-static char* construct_scrobble_voidwrap(void* passed, size_t index, size_t* res)
+// The same as above, but for multiple
+AV* perlify_scrobbles(struct mstdnt_scrobble* scrobble, size_t len)
 {
-    return construct_scrobble((struct mstdnt_scrobble*)passed + index, res);
-}
+    if (!(scrobble && len)) return NULL;
+    AV* av = newAV();
+    av_extend(av, len-1);
 
-char* construct_scrobbles(struct mstdnt_scrobble* scrobbles, size_t scrobbles_len, size_t* ret_size)
-{
-    return construct_func_strings(construct_scrobble_voidwrap, scrobbles, scrobbles_len, ret_size);
+    for (int i = 0; i < len; ++i)
+    {
+        av_store(av, i, newRV_inc((SV*)perlify_scrobble(scrobble + i)));
+    }
+
+    return av;
 }
diff --git a/src/scrobble.h b/src/scrobble.h
index 9e1f90d..ef20e9b 100644
--- a/src/scrobble.h
+++ b/src/scrobble.h
@@ -19,8 +19,9 @@
 #ifndef SCROBBLE_H
 #define SCROBBLE_H
 #include <mastodont.h>
+#include "global_perl.h"
 
-char* construct_scrobble(struct mstdnt_scrobble* scrobble, size_t* size);
-char* construct_scrobbles(struct mstdnt_scrobble* scrobbles, size_t scrobbles_len, size_t* ret_size);
+HV* perlify_scrobble(struct mstdnt_scrobble* scrobble);
+AV* perlify_scrobbles(struct mstdnt_scrobble* scrobble, size_t len);
 
 #endif /* SCROBBLE_H */
diff --git a/src/search.c b/src/search.c
index 5377e63..cf407f0 100644
--- a/src/search.c
+++ b/src/search.c
@@ -28,42 +28,6 @@
 #include "hashtag.h"
 #include "error.h"
 #include "account.h"
-#include "graphsnbars.h"
-
-// Pages
-#include "../static/search.ctmpl"
-#include "../static/search_all.ctmpl"
-
-void search_page(FCGX_Request* req,
-                 struct session* ssn,
-                 mastodont_t* api,
-                 enum search_tab tab,
-                 char* content)
-{
-    char* out_data;
-    struct search_template tdata = {
-        .prefix = config_url_prefix,
-        .query = keystr(ssn->query.query),
-        .accounts_active = MAKE_FOCUSED_IF(tab, SEARCH_ACCOUNTS),
-        .accounts = "Accounts",
-        .hashtags_active = MAKE_FOCUSED_IF(tab, SEARCH_HASHTAGS),
-        .hashtags = "Hashtags",
-        .statuses_active = MAKE_FOCUSED_IF(tab, SEARCH_STATUSES),
-        .statuses = "Statuses",
-        .results = content
-    };
-    out_data = tmpl_gen_search(&tdata, NULL);
-
-    struct base_page b = {
-        .category = BASE_CAT_NONE,
-        .content = out_data,
-        .sidebar_left = NULL
-    };
-
-    // Output
-    render_base_page(&b, req, ssn, api);
-    free(out_data);
-}
 
 void content_search_all(PATH_ARGS)
 {
diff --git a/src/search.h b/src/search.h
index 756de7c..7d30abf 100644
--- a/src/search.h
+++ b/src/search.h
@@ -23,18 +23,6 @@
 #include "path.h"
 #include "global_perl.h"
 
-enum search_tab
-{
-    SEARCH_STATUSES,
-    SEARCH_ACCOUNTS,
-    SEARCH_HASHTAGS,
-};
-
-void search_page(FCGX_Request* req,
-                 struct session* ssn,
-                 mastodont_t* api,
-                 enum search_tab tab,
-                 char* content);
 void content_search_all(PATH_ARGS);
 void content_search_statuses(PATH_ARGS);
 void content_search_accounts(PATH_ARGS);
diff --git a/src/status.c b/src/status.c
index a4890ec..39e8b71 100644
--- a/src/status.c
+++ b/src/status.c
@@ -30,50 +30,16 @@
 #include "cookie.h"
 #include "string_helpers.h"
 #include "error.h"
-#include "reply.h"
 #include "attachments.h"
 #include "emoji_reaction.h"
 #include "../config.h"
-#include "type_string.h"
 #include "string.h"
 #include "emoji.h"
 #include "account.h"
 
-// Pages
-#include "../static/status.ctmpl"
-#include "../static/notification.ctmpl"
-#include "../static/in_reply_to.ctmpl"
-#include "../static/status_interactions_label.ctmpl"
-#include "../static/status_interactions.ctmpl"
-#include "../static/status_interaction_profile.ctmpl"
-#include "../static/interactions_page.ctmpl"
-#include "../static/likeboost.ctmpl"
-#include "../static/reactions_btn.ctmpl"
-#include "../static/interaction_buttons.ctmpl"
-#include "../static/reply_link.ctmpl"
-#include "../static/reply_checkbox.ctmpl"
-#include "../static/menu_item.ctmpl"
-#include "../static/like_btn.ctmpl"
-#include "../static/repeat_btn.ctmpl"
-#include "../static/reply_btn.ctmpl"
-#include "../static/expand_btn.ctmpl"
-#include "../static/like_btn_img.ctmpl"
-#include "../static/repeat_btn_img.ctmpl"
-#include "../static/reply_btn_img.ctmpl"
-#include "../static/expand_btn_img.ctmpl"
-#include "../static/thread_page_btn.ctmpl"
-
 #define ACCOUNT_INTERACTIONS_LIMIT 11
 #define NUM_STR "%u"
 
-struct status_args
-{
-    mastodont_t* api;
-    struct mstdnt_status* status;
-    struct construct_statuses_args* args;
-    struct session* ssn;
-};
-
 int try_post_status(struct session* ssn, mastodont_t* api)
 {
     if (!(keystr(ssn->post.content))) return 1;
@@ -185,27 +151,6 @@ void content_status_react(PATH_ARGS)
     redirect(req, REDIRECT_303, referer);
 }
 
-const char* status_visibility_str(enum l10n_locale loc,
-                                  enum mstdnt_visibility_type vis)
-{
-    switch (vis)
-    {
-    case MSTDNT_VISIBILITY_UNLISTED:
-        return L10N[loc][L10N_VIS_UNLISTED];
-    case MSTDNT_VISIBILITY_PRIVATE:
-        return L10N[loc][L10N_VIS_PRIVATE];
-    case MSTDNT_VISIBILITY_DIRECT:
-        return L10N[loc][L10N_VIS_DIRECT];
-    case MSTDNT_VISIBILITY_LOCAL:
-        return L10N[loc][L10N_VIS_LOCAL];
-    case MSTDNT_VISIBILITY_LIST:
-        return L10N[loc][L10N_VIS_LIST];
-    case MSTDNT_VISIBILITY_PUBLIC:
-    default:
-        return L10N[loc][L10N_VIS_PUBLIC];
-    }
-}
-
 int try_interact_status(struct session* ssn, mastodont_t* api, char* id)
 {
     struct mstdnt_args m_args;
@@ -245,127 +190,6 @@ int try_interact_status(struct session* ssn, mastodont_t* api, char* id)
     return res;
 }
 
-char* construct_status_interactions_label(char* status_id,
-                                          int is_favourites,
-                                          char* header,
-                                          int val,
-                                          size_t* size)
-{
-    struct status_interactions_label_template tdata = {
-        .prefix = config_url_prefix,
-        .status_id = status_id,
-        .action = is_favourites ? "favourited_by" : "reblogged_by",
-        .header = header,
-        .value = val,
-    };
-    return tmpl_gen_status_interactions_label(&tdata, size);
-}
-
-char* construct_interaction_buttons(struct session* ssn,
-                                    struct mstdnt_status* status,
-                                    size_t* size,
-                                    uint8_t flags)
-{
-    return "";
-}
-
-char* construct_status_interactions(char* status_id,
-                                    int fav_count,
-                                    int reblog_count,
-                                    struct mstdnt_account* fav_accounts,
-                                    size_t fav_accounts_len,
-                                    struct mstdnt_account* reblog_accounts,
-                                    size_t reblog_accounts_len,
-                                    size_t* size)
-{
-    char* html;
-    char* reblogs_label = reblog_count ?
-        construct_status_interactions_label(status_id, 0, "Reblogs", reblog_count, NULL) : NULL;
-    char* favourites_label = fav_count ?
-        construct_status_interactions_label(status_id, 1, "Favorites", fav_count, NULL) : NULL;
-    char* profiles = construct_status_interaction_profiles(reblog_accounts,
-                                                           fav_accounts,
-                                                           reblog_accounts_len,
-                                                           fav_accounts_len,
-                                                           NULL);
-    struct status_interactions_template tdata = {
-        .favourites_count = favourites_label,
-        .reblogs_count = reblogs_label,
-        .users = profiles
-    };
-    html = tmpl_gen_status_interactions(&tdata, size);
-    if (reblogs_label) free(reblogs_label);
-    if (favourites_label) free(favourites_label);
-    if (profiles) free(profiles);
-    return html;
-}
-
-char* construct_status_interaction_profile(struct interact_profile_args* args, size_t index, size_t* size)
-{
-    size_t s = 0;
-    // Might change
-    struct mstdnt_account* check_type = args->reblogs;
-    char* profile_html = NULL;
-    
-    // Loop through reblogs first, then favourites
-    if (index >= args->reblogs_len)
-    {
-        index -= args->reblogs_len;
-        check_type = args->favourites;
-    }
-
-    // If favourites, loops through reblogs to verify no duplicates
-    if (check_type == args->favourites)
-    {
-        for (size_t i = 0; i < args->reblogs_len; ++i)
-            if (strcmp(check_type[index].id, args->reblogs[i].id) == 0)
-            {
-                if (size) *size = 0;
-                return NULL;
-            }
-    }
-
-    // Usually means no reblogs if check_type is NULL
-    if (check_type)
-    {
-        struct status_interaction_profile_template tdata = {
-            .acct = check_type[index].acct,
-            .avatar = check_type[index].avatar
-        };
-        profile_html = tmpl_gen_status_interaction_profile(&tdata, &s);
-    }
-    
-    if (size) *size = s;
-    return profile_html;
-}
-
-static char* construct_status_interaction_profiles_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct interact_profile_args* args = passed;
-    return construct_status_interaction_profile(args, index, res);
-}
-
-char* construct_status_interaction_profiles(struct mstdnt_account* reblogs,
-                                            struct mstdnt_account* favourites,
-                                            size_t reblogs_len,
-                                            size_t favourites_len,
-                                            size_t* ret_size)
-{
-    size_t arr_size = reblogs_len + favourites_len;
-    // Set a limit to interactions
-    if (arr_size > ACCOUNT_INTERACTIONS_LIMIT)
-        arr_size = ACCOUNT_INTERACTIONS_LIMIT;
-    
-    struct interact_profile_args args = {
-        .reblogs = reblogs,
-        .reblogs_len = reblogs_len,
-        .favourites = favourites,
-        .favourites_len = favourites_len
-    };
-    
-    return construct_func_strings(construct_status_interaction_profiles_voidwrap, &args, arr_size, ret_size);
-}
-
 char* get_in_reply_to(mastodont_t* api,
                       struct session* ssn,
                       struct mstdnt_status* status,
@@ -383,418 +207,15 @@ char* get_in_reply_to(mastodont_t* api,
                                     &acct,
                                     &storage);
 
-    char* html = construct_in_reply_to(status, res == 0 ? &acct : NULL, size);
+    char* html = "TODO";
+
+//    char* html = construct_in_reply_to(status, res == 0 ? &acct : NULL, size);
 
     if (res == 0) mstdnt_cleanup_account(&acct);
     mastodont_storage_cleanup(&storage);
     return html;
 }
 
-char* construct_in_reply_to(struct mstdnt_status* status,
-                            struct mstdnt_account* account,
-                            size_t* size)
-{
-    struct in_reply_to_template tdata = {
-        .prefix = config_url_prefix,
-        .in_reply_to_text = L10N[L10N_EN_US][L10N_IN_REPLY_TO],
-        .acct = account ? account->acct : status->in_reply_to_id,
-        .status_id = status->in_reply_to_id
-    };
-
-    return tmpl_gen_in_reply_to(&tdata, size);
-}
-
-#define REGEX_GREENTEXT "((?:^|<br/?>|\\s)&gt;.*?)(?:<br/?>|$)"
-
-char* reformat_status(struct session* ssn,
-                      char* content,
-                      struct mstdnt_emoji* emos,
-                      size_t emos_len)
-{
-    if (!content) return NULL;
-    char* res = make_mentions_local(content);
-    char* gt_res, *emo_res;
-    
-    if (emos)
-    {
-        emo_res = emojify(res, emos, emos_len);
-        if (emo_res != res && res != content)
-            free(res);
-        res = emo_res;
-    }
-    
-    if (ssn->config.stat_greentexts)
-    {
-        gt_res = greentextify(res);
-        if (gt_res != res && res != content)
-            free(res);
-        res = gt_res;
-    }
-    
-    return res;
-}
-
-#define REGEX_MENTION "(?=<a .*?mention.*?)<a .*?href=\"https?:\\/\\/(?<url>.*?)\\/(?:@|users\\/)?(?<>.*?)?\".*?>"
-
-char* make_mentions_local(char* content)
-{
-    char* url_format;
-    int error;
-    PCRE2_SIZE erroffset;
-    int substitute_success = 0;
-    // Initial size, will be increased by 30% if pcre2_substitute cannot fit into the size
-    // ...why can't pcre2 just allocate a string with the size for us? Thanks...
-    size_t res_len = 1024;
-    char* res = malloc(res_len);
-    pcre2_code* re = pcre2_compile((PCRE2_SPTR)REGEX_MENTION,
-                                   PCRE2_ZERO_TERMINATED, PCRE2_MULTILINE,
-                                   &error, &erroffset, NULL);
-    if (re == NULL)
-    {
-        fprintf(stderr, "Couldn't parse regex at offset %d: %s\n", error, REGEX_MENTION + erroffset);
-        pcre2_code_free(re);
-        return NULL;
-    }
-
-    int len = easprintf(&url_format,
-                        "<a target=\"_parent\" class=\"mention\" href=\"http%s://%s/@$2@$1\">",
-                        config_host_url_insecure ? "" : "s",
-                        getenv("HTTP_HOST"));
-
-    int rc = -1;
-    PCRE2_SIZE res_len_str;
-    while (rc < 0)
-    {
-        res_len_str = res_len;
-        rc = pcre2_substitute(
-            re,
-            (PCRE2_SPTR)content,
-            PCRE2_ZERO_TERMINATED,
-            0,
-            PCRE2_SUBSTITUTE_EXTENDED | PCRE2_SUBSTITUTE_GLOBAL,
-            NULL,
-            NULL,
-            (PCRE2_SPTR)url_format,
-            len,
-            (PCRE2_UCHAR*)res,
-            &res_len_str
-            );
-        if (rc < 0)
-        {
-            switch (rc)
-            {
-            case PCRE2_ERROR_NOMEMORY:
-                // Increase by 30% and try again
-                res_len = (float)res_len + ((float)res_len * .3);
-                res = realloc(res, res_len);
-                break;
-            default:
-            {
-                char buf[256];
-                pcre2_get_error_message(rc, buf, 256);
-                goto out;
-            }
-            }
-        }
-        else
-            substitute_success = 1;
-    }
-
-out:
-    if (!substitute_success)
-        free(res);
-    free(url_format);
-    pcre2_code_free(re);
-    return substitute_success ? res : content;
-}
-
-char* greentextify(char* content)
-{
-    if (!content) return NULL;
-    
-    int error;
-    PCRE2_SIZE erroffset;
-    int rc;
-    int gt_off;
-    int gt_len;
-    char* res = content;
-
-    // Malloc'd strings
-    char* reg_string;
-    char* gt_string;
-    
-    char* oldres = NULL;
-    PCRE2_SIZE* re_results;
-    pcre2_code* re = pcre2_compile((PCRE2_SPTR)REGEX_GREENTEXT, PCRE2_ZERO_TERMINATED, 0, &error, &erroffset, NULL);
-    pcre2_match_data* re_data;
-    if (re == NULL)
-    {
-        fprintf(stderr, "Couldn't parse regex at offset %ld: %d\n", erroffset, error);
-        pcre2_code_free(re);
-        return res;
-    }
-
-    re_data = pcre2_match_data_create_from_pattern(re, NULL);
-
-    for (int ind = 0;;)
-    {
-        rc = pcre2_match(re, (PCRE2_SPTR)res, strlen(res), ind, 0, re_data, NULL);
-        if (rc < 0)
-            break;
-
-        re_results = pcre2_get_ovector_pointer(re_data);
-
-        // Store to last result
-        gt_off = re_results[2];
-        gt_len = re_results[3] - gt_off;
-
-        oldres = res;
-
-        // Malloc find/repl strings
-        reg_string = malloc(gt_len + 1);
-        strncpy(reg_string, res + gt_off, gt_len);
-        reg_string[gt_len] = '\0';
-        easprintf(&gt_string, "<span class=\"greentext\">%s</span>", reg_string);
-        
-        res = strrepl(res, reg_string, gt_string, STRREPL_ALL );
-        if (oldres != content) free(oldres);
-        ind = re_results[2] + strlen(gt_string);
-        free(reg_string);
-        free(gt_string);
-    }
-
-    pcre2_match_data_free(re_data);
-    pcre2_code_free(re);
-    return res;
-}
-
-char* construct_status(struct session* ssn,
-                       mastodont_t* api,
-                       struct mstdnt_status* local_status,
-                       size_t* size,
-                       struct mstdnt_notification* local_notif,
-                       struct construct_statuses_args* args,
-                       uint8_t flags)
-{
-    struct mstdnt_args m_args;
-    set_mstdnt_args(&m_args, ssn);
-    char* stat_html;
-
-    // Counts
-    char* formatted_display_name = NULL;
-    char* attachments = NULL;
-    char* emoji_reactions = NULL;
-    char* serialized_display_name = NULL;
-    char* interaction_btns = NULL;
-    char* notif_info = NULL;
-    char* post_response = NULL;
-    char* in_reply_to_str = NULL;
-    char* delete_status = NULL;
-    char* pin_status = NULL;
-    char* interactions_html = NULL;
-    enum l10n_locale locale = l10n_normalize(ssn->config.lang);
-    struct mstdnt_status* status = local_status;
-    // Create a "fake" notification header which contains information for
-    // the reblogged status
-    struct mstdnt_notification notif_reblog;
-    struct mstdnt_notification* notif = local_notif;
-    struct mstdnt_account* favourites = NULL;
-    struct mstdnt_account* reblogs = NULL;
-    struct mstdnt_storage favourites_storage = { 0 };
-    struct mstdnt_storage reblogs_storage = { 0 };
-    size_t favourites_len = 0;
-    size_t reblogs_len = 0;
-
-    if (!status) return NULL;
-
-    // If focused, show status interactions
-    if ((flags & STATUS_FOCUSED) == STATUS_FOCUSED &&
-        (status->reblogs_count || status->favourites_count))
-    {
-        if (status->favourites_count)
-            mastodont_status_favourited_by(api,
-                                           &m_args,
-                                           status->id,
-                                           &favourites_storage,
-                                           &favourites,
-                                           &favourites_len);
-        if (status->reblogs_count)
-            mastodont_status_reblogged_by(api,
-                                          &m_args,
-                                          status->id,
-                                          &reblogs_storage,
-                                          &reblogs,
-                                          &reblogs_len);
-        interactions_html = construct_status_interactions(status->id,
-                                                          status->favourites_count,
-                                                          status->reblogs_count,
-                                                          favourites,
-                                                          favourites_len,
-                                                          reblogs,
-                                                          reblogs_len,
-                                                          NULL);
-        mastodont_storage_cleanup(&reblogs_storage);
-        mastodont_storage_cleanup(&favourites_storage);
-        
-        mstdnt_cleanup_accounts(favourites, favourites_len);
-        mstdnt_cleanup_accounts(reblogs, reblogs_len);
-    }
-
-    // Repoint value if it's a reblog
-    if (status->reblog)
-    {
-        status = status->reblog;
-        // Point to our account
-        notif_reblog.account = &(local_status->account);
-        notif_reblog.type = MSTDNT_NOTIFICATION_REBLOG;
-        notif = &notif_reblog;
-    }
-
-    // Format username with emojis
-    serialized_display_name = sanitize_html(status->account.display_name);
-    formatted_display_name = emojify(serialized_display_name,
-                                     status->account.emojis,
-                                     status->account.emojis_len);
-    // Format status
-    char* parse_content = reformat_status(ssn, status->content, status->emojis, status->emojis_len);
-
-    interaction_btns = construct_interaction_buttons(ssn, status, NULL, flags);
-    
-    // Find and replace
-    if (args && args->highlight_word && parse_content != status->content)
-    {
-        char* parse_content_tmp;
-        char* repl_str = NULL;
-        easprintf(&repl_str, "<span class=\"search-highlight\">%s</span>", args->highlight_word);
-        parse_content_tmp = parse_content;
-        parse_content = strrepl(parse_content, args->highlight_word, repl_str, STRREPL_ALL);
-        // Check if the old parse_content needed to be free'd
-        if (parse_content_tmp != status->content &&
-            parse_content != parse_content_tmp)
-            free(parse_content_tmp);
-        else // No results, move back
-            parse_content = parse_content_tmp;
-
-        free(repl_str);
-    }
-
-    if (ssn->logged_in)
-        post_response = reply_status(ssn, status->in_reply_to_account_id , status);
-
-    // Delete status menu item and pinned, logged in only
-    if (ssn->logged_in && strcmp(status->account.acct, ssn->acct.acct) == 0)
-    {
-        struct menu_item_template mdata = {
-            .prefix = config_url_prefix,
-            .status_id = status->id,
-            .itype = "delete",
-            .text = "Delete status"
-        };
-        delete_status = tmpl_gen_menu_item(&mdata, NULL);
-        
-        mdata.itype = status->pinned ? "unpin" : "pin";
-        mdata.text = status->pinned ? "Unpin status" : "Pin status";
-        pin_status = tmpl_gen_menu_item(&mdata, NULL);
-    }
-    
-    if (status->media_attachments_len)
-        attachments = construct_attachments(ssn, status->sensitive, status->media_attachments, status->media_attachments_len, NULL);
-    if (status->pleroma.emoji_reactions_len)
-        emoji_reactions = construct_emoji_reactions(status->id, status->pleroma.emoji_reactions, status->pleroma.emoji_reactions_len, NULL);
-    if (notif && notif->type != MSTDNT_NOTIFICATION_MENTION)
-    {
-        char* notif_serialized_name = sanitize_html(notif->account->display_name);
-        char* notif_display_name = emojify(notif_serialized_name,
-                                           notif->account->emojis,
-                                           notif->account->emojis_len);
-        struct notification_template tdata = {
-            .avatar = notif->account->avatar,
-            .username = notif_display_name,
-            .action = (local_status->reblog ? notification_type_compact_str(notif->type) : notification_type_str(notif->type)),
-            .action_item = notification_type_svg(notif->type),
-        };
-        notif_info = tmpl_gen_notification(&tdata, NULL);
-        if (notif_display_name != notif->account->display_name)
-            free(notif_display_name);
-        if (notif_serialized_name != notif_display_name &&
-            notif_serialized_name != notif->account->display_name)
-            free(notif_serialized_name);
-    }
-
-    if (status->in_reply_to_id && status->in_reply_to_account_id)
-        in_reply_to_str = get_in_reply_to(api, ssn, status, NULL);
-
-    struct status_template tmpl = {
-        .status_id = status->id,
-        .notif_info = notif_info,
-        .thread_hidden = status->muted ? "checked" : "",
-        // TODO doesn't even need to be a hashtag, this is a temporary hack
-        .is_cat = status->account.note && strstr(status->account.note, "isCat") ? "is-cat" : NULL,
-        .is_bun = status->account.note && strstr(status->account.note, "isBun") ? " is-bun" : NULL,
-        .avatar = status->account.avatar,
-        .username = formatted_display_name,
-        .prefix = config_url_prefix,
-        .acct = status->account.acct,
-        .visibility = status_visibility_str(locale, status->visibility),
-        .unmute = status->muted ? "un" : "",
-        .unmute_btn = status->muted ? "Unmute thread" : "Mute thread",
-        .unbookmark =  status->bookmarked ? "un" : "",
-        .unbookmark_btn = status->bookmarked ? "Remove Bookmark" : "Bookmark",
-        .delete_status = delete_status,
-        .pin_status = pin_status,
-        .in_reply_to_str = in_reply_to_str,
-        .status_content = parse_content,
-        .attachments = attachments,
-        .interactions = interactions_html,
-        .emoji_reactions = emoji_reactions,
-        .interaction_btns = interaction_btns,
-        .reply = post_response,
-    };
-
-    stat_html = tmpl_gen_status(&tmpl, size);
-    
-    // Cleanup
-    if (formatted_display_name != status->account.display_name &&
-        formatted_display_name != serialized_display_name)
-        free(formatted_display_name);
-    if (serialized_display_name != status->account.display_name)
-        free(serialized_display_name);
-    free(in_reply_to_str);
-    free(attachments);
-    free(post_response);
-    free(emoji_reactions);
-    if (notif) free(notif_info);
-    free(delete_status);
-    free(pin_status);
-    free(interactions_html);
-    if (parse_content != status->content)
-        free(parse_content);
-    return stat_html;
-}
-
-static char* construct_status_voidwrap(void* passed, size_t index, size_t* res)
-{
-    struct status_args* args = passed;
-    return construct_status(args->ssn, args->api, args->status + index, res, NULL, args->args, 0);
-}
-
-char* construct_statuses(struct session* ssn,
-                         mastodont_t* api,
-                         struct mstdnt_status* statuses,
-                         size_t size,
-                         struct construct_statuses_args* args,
-                         size_t* ret_size)
-{
-    if (!(statuses && size)) return NULL;
-    struct status_args stat_args = {
-        .api = api,
-        .status = statuses,
-        .args = args,
-        .ssn = ssn,
-    };
-    return construct_func_strings(construct_status_voidwrap, &stat_args, size, ret_size);
-}
-
 void status_interact(PATH_ARGS)
 {
     char* referer = GET_ENV("HTTP_REFERER", req);
diff --git a/src/status.h b/src/status.h
index 812af79..f90648c 100644
--- a/src/status.h
+++ b/src/status.h
@@ -53,64 +53,17 @@ void content_status_create(PATH_ARGS);
 void content_status_react(PATH_ARGS);
 
 // HTML Builders
-char* construct_status(struct session* ssn,
-                       mastodont_t* api,
-                       struct mstdnt_status* status,
-                       size_t* size,
-                       struct mstdnt_notification* notif,
-                       struct construct_statuses_args* args,
-                       uint8_t flags);
-char* construct_statuses(struct session* ssn,
-                         mastodont_t* api,
-                         struct mstdnt_status* statuses,
-                         size_t size,
-                         struct construct_statuses_args* args,
-                         size_t* ret_size);
-char* construct_interaction_buttons(struct session* ssn,
-                                    struct mstdnt_status* status,
-                                    size_t* size,
-                                    uint8_t flags);
+
 // Reply to
+/** Deprecated: May be used in the future for Mastodon only */
 char* get_in_reply_to(mastodont_t* api,
                       struct session* ssn,
                       struct mstdnt_status* status,
                       size_t* size);
-char* construct_in_reply_to(struct mstdnt_status* status,
-                            struct mstdnt_account* account,
-                            size_t* size);
-
-char* construct_status_interactions(char* status_id,
-                                    int fav_count,
-                                    int reblog_count,
-                                    struct mstdnt_account* fav_accounts,
-                                    size_t fav_accounts_len,
-                                    struct mstdnt_account* reblog_accounts,
-                                    size_t reblog_accounts_len,
-                                    size_t* size);
-
-char* construct_status_interaction_profiles(struct mstdnt_account* reblogs,
-                                            struct mstdnt_account* favourites,
-                                            size_t reblogs_len,
-                                            size_t favourites_len,
-                                            size_t* ret_size);
-char* construct_status_interaction_profile(struct interact_profile_args* args, size_t index, size_t* size);
-char* construct_status_interactions_label(char* status_id,
-                                          int is_favourites,
-                                          char* header,
-                                          int val,
-                                          size_t* size);
-char* reformat_status(struct session* ssn,
-                      char* content,
-                      struct mstdnt_emoji* emos,
-                      size_t emos_len);
-char* greentextify(char* content);
-char* make_mentions_local(char* content);
 
 void status_view_reblogs(PATH_ARGS);
 void status_view_favourites(PATH_ARGS);
 
-const char* status_visibility_str(enum l10n_locale locale, enum mstdnt_visibility_type visibility);
-
 void content_status_interactions(FCGX_Request* req,
                                  struct session* ssn,
                                  mastodont_t* api,
diff --git a/src/timeline.c b/src/timeline.c
index 2f57909..d6151af 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -26,15 +26,10 @@
 #include "index.h"
 #include "status.h"
 #include "easprintf.h"
-#include "reply.h"
-#include "navigation.h"
 #include "query.h"
 #include "error.h"
 #include "string_helpers.h"
 
-#include "../static/timeline_options.ctmpl"
-#include "../static/navigation.ctmpl"
-
 void content_timeline(FCGX_Request* req,
                       struct session* ssn,
                       mastodont_t* api,
diff --git a/src/type_string.c b/src/type_string.c
deleted file mode 100644
index 24d20f7..0000000
--- a/src/type_string.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "type_string.h"
-
-// Icons
-#include "../static/like_svg.ctmpl"
-#include "../static/repeat_svg.ctmpl"
-#include "../static/follow_svg.ctmpl"
-
-const char* notification_type_str(mstdnt_notification_t type)
-{
-    switch (type)
-    {
-    case MSTDNT_NOTIFICATION_FOLLOW: return L10N[L10N_EN_US][L10N_NOTIF_FOLLOW];
-    case MSTDNT_NOTIFICATION_FOLLOW_REQUEST: return L10N[L10N_EN_US][L10N_NOTIF_FOLLOW_REQUEST];
-    case MSTDNT_NOTIFICATION_REBLOG: return L10N[L10N_EN_US][L10N_NOTIF_REPEATED];
-    case MSTDNT_NOTIFICATION_FAVOURITE: return L10N[L10N_EN_US][L10N_NOTIF_LIKED];
-    case MSTDNT_NOTIFICATION_POLL: return L10N[L10N_EN_US][L10N_NOTIF_POLL];
-    case MSTDNT_NOTIFICATION_EMOJI_REACT: return L10N[L10N_EN_US][L10N_NOTIF_REACTED_WITH];
-    default: return "";
-    }
-}
-
-const char* notification_type_compact_str(mstdnt_notification_t type)
-{
-    switch (type)
-    {
-    case MSTDNT_NOTIFICATION_FOLLOW: return L10N[L10N_EN_US][L10N_NOTIF_COMPACT_FOLLOW];
-    case MSTDNT_NOTIFICATION_FOLLOW_REQUEST: return L10N[L10N_EN_US][L10N_NOTIF_COMPACT_FOLLOW_REQUEST];
-    case MSTDNT_NOTIFICATION_REBLOG: return L10N[L10N_EN_US][L10N_NOTIF_COMPACT_REPEATED];
-    case MSTDNT_NOTIFICATION_FAVOURITE: return L10N[L10N_EN_US][L10N_NOTIF_COMPACT_LIKED];
-    case MSTDNT_NOTIFICATION_POLL: return L10N[L10N_EN_US][L10N_NOTIF_COMPACT_POLL];
-    case MSTDNT_NOTIFICATION_EMOJI_REACT: return L10N[L10N_EN_US][L10N_NOTIF_COMPACT_REACTED_WITH];
-    default: return "";
-    }
-}
-
-
-const char* notification_type_svg(mstdnt_notification_t type)
-{
-    switch (type)
-    {
-    case MSTDNT_NOTIFICATION_FOLLOW: return data_follow_svg;
-    case MSTDNT_NOTIFICATION_FOLLOW_REQUEST: return "";
-    case MSTDNT_NOTIFICATION_REBLOG: return data_repeat_svg;
-    case MSTDNT_NOTIFICATION_FAVOURITE: return data_like_svg;
-    case MSTDNT_NOTIFICATION_POLL: return "";
-    case MSTDNT_NOTIFICATION_EMOJI_REACT: return "";
-    default: return "";
-    }
-}
diff --git a/src/type_string.h b/src/type_string.h
deleted file mode 100644
index a24f403..0000000
--- a/src/type_string.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Treebird - Lightweight frontend for Pleroma
- * Copyright (C) 2022 Nekobit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef TYPE_STRING_H
-#define TYPE_STRING_H
-#include <mastodont.h>
-#include "l10n.h"
-
-const char* notification_type_svg(mstdnt_notification_t type);
-const char* notification_type_str(mstdnt_notification_t type);
-const char* notification_type_compact_str(mstdnt_notification_t type);
-
-#endif // TYPE_STRING_H

From f916e8d0c7d7c7c777edb89b000f7fdaeba6884a Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 22 Aug 2022 16:46:59 +0000
Subject: [PATCH 114/143] Show emoji picker

FossilOrigin-Name: 3973f69d88b1e4b7394095ed335f686d2565b5242be79c7ffb1e362f38bdfcde
---
 perl/status.pm              |  9 +++++----
 src/status.c                | 11 +++++++++++
 templates/content_status.tt |  6 +++---
 templates/status.tt         |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/perl/status.pm b/perl/status.pm
index 48d65c1..c366900 100644
--- a/perl/status.pm
+++ b/perl/status.pm
@@ -18,7 +18,7 @@ my $rel_context = 0;
 
 sub generate_status
 {
-    my ($ssn, $data, $status, $notif, $is_compact) = @_;
+    my ($ssn, $data, $status, $notif, $is_compact, $picker) = @_;
     my $boost_acct;
 
     # Move status reference for boosts and keep account
@@ -37,6 +37,7 @@ sub generate_status
         status => $status,
         boost => $boost_acct, # May be undef
         data => $data,
+        emoji_picker => $picker,
         notif => $notif, # May be undef
         compact => $is_compact, # May be undef
         is_statusey_notif => $is_statusey_notif,
@@ -76,19 +77,19 @@ sub generate_status
 
 sub content_status
 {
-    my ($ssn, $data, $status, $statuses_before, $statuses_after) = @_;
+    my ($ssn, $data, $status, $statuses_before, $statuses_after, $picker) = @_;
 
     $rel_context = 0;
 
     my %vars = (
         prefix => '',
         ssn => $ssn,
-        data => $data,
         status => $status,
+        picker => $picker,
         statuses_before => $statuses_before,
         statuses_after => $statuses_after,
         # Functions
-        create_status => \&generate_status,
+        create_status => sub { generate_status($ssn, $data, shift, 0, 0, shift) },
         );
 
 
diff --git a/src/status.c b/src/status.c
index 39e8b71..60a9fb5 100644
--- a/src/status.c
+++ b/src/status.c
@@ -352,6 +352,8 @@ void content_status(PATH_ARGS, uint8_t flags)
     struct mstdnt_status* statuses_before = NULL,
         *statuses_after = NULL,
         status = { 0 };
+    char* picker = NULL;
+    size_t picker_len;
     size_t stat_before_len = 0, stat_after_len = 0;
     
     try_post_status(ssn, api);
@@ -363,6 +365,9 @@ void content_status(PATH_ARGS, uint8_t flags)
                                  &statuses_before, &statuses_after,
                                  &stat_before_len, &stat_after_len);
 
+    if ((flags & STATUS_EMOJI_PICKER) == STATUS_EMOJI_PICKER)
+        picker = construct_emoji_picker(status.id, &picker_len);
+
 
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
@@ -379,6 +384,11 @@ void content_status(PATH_ARGS, uint8_t flags)
     else
         ARG_UNDEFINED();
 
+    if (picker)
+    {
+        XPUSHs(newSVpv(picker, picker_len));
+    } else ARG_UNDEFINED();
+
     PERL_STACK_SCALAR_CALL("status::content_status");
 
     char* dup = PERL_GET_STACK_EXIT;
@@ -399,6 +409,7 @@ void content_status(PATH_ARGS, uint8_t flags)
     mastodont_storage_cleanup(&storage);
     mastodont_storage_cleanup(&status_storage);
     Safefree(dup);
+    free(picker);
 }
 
 void notice_redirect(PATH_ARGS)
diff --git a/templates/content_status.tt b/templates/content_status.tt
index 3cd6cc9..578ef39 100644
--- a/templates/content_status.tt
+++ b/templates/content_status.tt
@@ -1,7 +1,7 @@
 [% FOREACH i IN statuses_before %]
-    [% create_status(ssn, data, i) %]
+    [% create_status(i) %]
 [% END %]
-[% create_status(ssn, data, status) %]
+[% create_status(status, picker) %]
 [% FOREACH i IN statuses_after %]
-    [% create_status(ssn, data, i) %]
+    [% create_status(i) %]
 [% END %]
diff --git a/templates/status.tt b/templates/status.tt
index 63289cb..f2654c3 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -176,6 +176,7 @@
                                 [% icon('emoji') %]
                             </a>
                             [% IF emoji_picker -%]
+                                aaa
                                 [% emoji_picker %]
                             [%- END %]
                         </div>

From dceb8881bb2b42451db0ae2d855c67b08794ddfa Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Mon, 22 Aug 2022 17:23:16 +0000
Subject: [PATCH 115/143] Emoji picker

Seems to have a bug when using data::dumper, may be deeper, so check it out

FossilOrigin-Name: 2ccee21d230f55f38d2f53b0e8bbff2df711d5db45e1a7451bb10850935baff8
---
 perl/emojis.pm |  1 -
 src/emoji.c    | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/perl/emojis.pm b/perl/emojis.pm
index 27acb38..a16c172 100644
--- a/perl/emojis.pm
+++ b/perl/emojis.pm
@@ -1,7 +1,6 @@
 package emojis;
 use strict;
 use warnings;
-use Data::Dumper;
 use Exporter 'import';
 
 our @EXPORT = qw( generate_emoji );
diff --git a/src/emoji.c b/src/emoji.c
index e065296..58b0d79 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -50,10 +50,10 @@ char* construct_emoji(struct emoji_info* emoji, char* status_id, size_t* size)
     char* emoji_str;
 
     if (status_id)
-        easprintf(&emoji_str, "<a href=\"/status/%s/react/%s\" class=\"emoji\">%s</a>",
+        *size = easprintf(&emoji_str, "<a href=\"/status/%s/react/%s\" class=\"emoji\">%s</a>",
                   status_id, emoji->codes, emoji->codes);
     else
-        easprintf(&emoji_str, "<span class=\"emoji\">%s</span>", emoji->codes);
+        *size = easprintf(&emoji_str, "<span class=\"emoji\">%s</span>", emoji->codes);
     return emoji_str;
 }
 
@@ -102,16 +102,17 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     emojis[EMO_CAT_ACTIVITIES] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_ACTIVITIES, EMOJO_CAT_OBJECTS - EMOJO_CAT_ACTIVITIES, len + 4);
     emojis[EMO_CAT_OBJECTS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_OBJECTS, EMOJO_CAT_SYMBOLS - EMOJO_CAT_OBJECTS, len + 5);
     emojis[EMO_CAT_SYMBOLS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_SYMBOLS, EMOJO_CAT_FLAGS - EMOJO_CAT_SYMBOLS, len + 6);
-    emojis[EMO_CAT_FLAGS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FLAGS, EMOJO_CAT_MAX - EMOJO_CAT_FLAGS, len + 6);
+    emojis[EMO_CAT_FLAGS] = construct_func_strings(construct_emoji_voidwrap, args + EMO_CAT_FLAGS, EMOJO_CAT_MAX - EMOJO_CAT_FLAGS, len + 7);
 
     PERL_STACK_INIT;
     XPUSHs(newRV_noinc((SV*)template_files));
     AV* av = newAV();
+    av_extend(av, EMO_CAT_LEN);
     for (int i = 0; i < EMO_CAT_LEN; ++i)
     {
-        av_store(av, i, newSVpv(emojis[i], len[i]));
+        av_store(av, i, newSVpv(emojis[i], 0));
     }
-    XPUSHs(newRV_inc((SV*)av));
+    XPUSHs(newRV_noinc((SV*)av));
     PERL_STACK_SCALAR_CALL("emojis::emoji_picker");
 
     char* dup = PERL_GET_STACK_EXIT;

From 78c68f5a92fcb4d8a8f9c984d60fdb0136bcaf8b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 23 Aug 2022 17:01:32 +0000
Subject: [PATCH 116/143] request macro

FossilOrigin-Name: 772a47d24d0ba6364561f29f8dad44abb63f267458ff893c998047574a99e7ff
---
 src/path.h | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/path.h b/src/path.h
index 2814127..ef0c57b 100644
--- a/src/path.h
+++ b/src/path.h
@@ -25,7 +25,13 @@
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
 
-#define PATH_ARGS FCGX_Request* req, struct session* ssn, mastodont_t* api, char** data
+#ifdef SINGLE_THREADED
+#define REQUEST_T FCGX_Request*
+#else
+#define REQUEST_T void*
+#endif
+
+#define PATH_ARGS REQUEST_T* req, struct session* ssn, mastodont_t* api, char** data
 
 struct path_info
 {
@@ -33,13 +39,19 @@ struct path_info
     void (*callback)(PATH_ARGS);
 };
 
-void handle_paths(FCGX_Request* req,
-                  struct session* ssn,
-                  mastodont_t* api,
-                  struct path_info* paths,
-                  size_t paths_len);
+void handle_paths(
+#ifdef SINGLE_THREADED
+    void*
+#else
+    FCGX_Request*
+#endif
+    req,
+    struct session* ssn,
+    mastodont_t* api,
+    struct path_info* paths,
+    size_t paths_len);
 
-int parse_path(FCGX_Request* req,
+int parse_path(REQUEST_T req,
                struct session* ssn,
                mastodont_t* api,
                struct path_info* path_info);

From d2b9d500b266d167b212954878f75583cbba4b68 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 23 Aug 2022 17:05:26 +0000
Subject: [PATCH 117/143] Fix

FossilOrigin-Name: f859a15e4a2ac7336622350ee84ed51245a8e14c8bf26cb712022f4756b53c0c
---
 src/path.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/path.h b/src/path.h
index ef0c57b..243f1fd 100644
--- a/src/path.h
+++ b/src/path.h
@@ -26,12 +26,12 @@
 #include <fcgiapp.h>
 
 #ifdef SINGLE_THREADED
-#define REQUEST_T FCGX_Request*
-#else
 #define REQUEST_T void*
+#else
+#define REQUEST_T FCGX_Request*
 #endif
 
-#define PATH_ARGS REQUEST_T* req, struct session* ssn, mastodont_t* api, char** data
+#define PATH_ARGS REQUEST_T req, struct session* ssn, mastodont_t* api, char** data
 
 struct path_info
 {

From dce5df9821014ae6091f12fb5733dc42dd9a6253 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Tue, 23 Aug 2022 18:50:34 +0000
Subject: [PATCH 118/143] Single threaded ifdef

FossilOrigin-Name: 06ba85d5a4f7912cfce89256d3ff9b3089000c4b1deaddf1c4d42f17c2f25ce1
---
 src/cookie.c  |  2 +-
 src/cookie.h  |  3 ++-
 src/main.c    | 11 ++++++++---
 src/path.h    |  7 +------
 src/query.c   |  6 +++---
 src/query.h   |  7 ++++---
 src/request.h | 28 ++++++++++++++++++++++++++++
 7 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100644 src/request.h

diff --git a/src/cookie.c b/src/cookie.c
index b0cf02e..045faa7 100644
--- a/src/cookie.c
+++ b/src/cookie.c
@@ -29,7 +29,7 @@ enum cookie_state
     STATE_V_START,
 };
 
-char* read_cookies_env(FCGX_Request* req, struct cookie_values* cookies)
+char* read_cookies_env(REQUEST_T req, struct cookie_values* cookies)
 {
     struct http_cookie_info info;
     char* cookies_env = GET_ENV("HTTP_COOKIE", req);
diff --git a/src/cookie.h b/src/cookie.h
index 0381de7..b462427 100644
--- a/src/cookie.h
+++ b/src/cookie.h
@@ -23,6 +23,7 @@
 #include "key.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
+#include "request.h"
 
 struct cookie_values
 {
@@ -61,7 +62,7 @@ struct http_cookie_info
 
 // Stupidly fast simple cookie parser
 char* parse_cookies(char* begin, struct http_cookie_info* info);
-char* read_cookies_env(FCGX_Request* req, struct cookie_values* cookies);
+char* read_cookies_env(REQUEST_T req, struct cookie_values* cookies);
 int cookie_get_val(char* src, char* key, struct http_cookie_info* info);
 
 HV* perlify_cookies(struct cookie_values* cookies);
diff --git a/src/main.c b/src/main.c
index 6f8cdb7..48416f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,7 @@
 #include "conversations.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
+#include "request.h"
 
 #define THREAD_COUNT 20
 
@@ -115,7 +116,7 @@ static struct path_info paths[] = {
     { "/treebird_api/v1/attachment", api_attachment_create },
 };
 
-static void application(mastodont_t* api, FCGX_Request* req)
+static void application(mastodont_t* api, REQUEST_T req)
 {
     // Default config
     struct session ssn = {
@@ -174,7 +175,8 @@ static void application(mastodont_t* api, FCGX_Request* req)
         cleanup_media_storages(&ssn, attachments);
 }
 
-static void* cgi_start(void* arg)
+#ifndef SINGLE_THREADED
+static void* threaded_fcgi_start(void* arg)
 {
     mastodont_t* api = arg;
     int rc;
@@ -198,6 +200,7 @@ static void* cgi_start(void* arg)
 
     return NULL;
 }
+#endif
 
 EXTERN_C void xs_init(pTHX)
 {
@@ -230,6 +233,7 @@ int main(int argc, char **argv, char **env)
     // Fetch information about the current instance
     load_instance_info_cache(&api);
 
+#ifndef SINGLE_THREADED
     // Start thread pool
     pthread_t id[THREAD_COUNT];
 
@@ -237,12 +241,13 @@ int main(int argc, char **argv, char **env)
         pthread_create(&id[i], NULL, cgi_start, &api);
 
     // Hell, let's not sit around here either
-    cgi_start(&api);
+threaded_fcgi_start(&api);
     
     FCGX_ShutdownPending();
     
     for (unsigned i = 0; i < THREAD_COUNT; ++i)
         pthread_join(id[i], NULL);
+#endif
    
     free_instance_info_cache();
     mastodont_global_curl_cleanup();
diff --git a/src/path.h b/src/path.h
index 243f1fd..2b0aceb 100644
--- a/src/path.h
+++ b/src/path.h
@@ -24,12 +24,7 @@
 #include "env.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
-
-#ifdef SINGLE_THREADED
-#define REQUEST_T void*
-#else
-#define REQUEST_T FCGX_Request*
-#endif
+#include "request.h"
 
 #define PATH_ARGS REQUEST_T req, struct session* ssn, mastodont_t* api, char** data
 
diff --git a/src/query.c b/src/query.c
index 4943799..5755a17 100644
--- a/src/query.c
+++ b/src/query.c
@@ -26,7 +26,7 @@
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
 
-char* read_get_data(FCGX_Request* req, struct get_values* query)
+char* read_get_data(REQUEST_T req, struct get_values* query)
 {
     struct http_query_info info = { 0 };
     char* query_string = GET_ENV("QUERY_STRING", req);
@@ -76,7 +76,7 @@ char* read_get_data(FCGX_Request* req, struct get_values* query)
 
 
 
-char* read_post_data(FCGX_Request* req, struct post_values* post)
+char* read_post_data(REQUEST_T req, struct post_values* post)
 {
     ptrdiff_t begin_curr_size;
     struct http_query_info query_info;
@@ -212,7 +212,7 @@ char* parse_query(char* begin, struct http_query_info* info)
     return end ? NULL : begin+1;
 }
 
-char* try_handle_post(FCGX_Request* req, void (*call)(struct http_query_info*, void*), void* arg)
+char* try_handle_post(REQUEST_T req, void (*call)(struct http_query_info*, void*), void* arg)
 {
     char* request_method = GET_ENV("REQUEST_METHOD", req);
     char* post_query = NULL, * p_query_read;
diff --git a/src/query.h b/src/query.h
index a7953bd..282d2f7 100644
--- a/src/query.h
+++ b/src/query.h
@@ -22,6 +22,7 @@
 #include <fcgi_stdio.h>
 #include <stddef.h>
 #include "key.h"
+#include "request.h"
 
 struct http_query_info
 {
@@ -83,11 +84,11 @@ struct get_values
     struct key type; // Int
 };
 
-char* read_get_data(FCGX_Request* req, struct get_values* query);
-char* read_post_data(FCGX_Request* req, struct post_values* post);
+char* read_get_data(REQUEST_T req, struct get_values* query);
+char* read_post_data(REQUEST_T req, struct post_values* post);
 /* A stupidly quick query parser */
 char* parse_query(char* begin, struct http_query_info* info);
-char* try_handle_post(FCGX_Request* req, void (*call)(struct http_query_info*, void*), void* arg);
+char* try_handle_post(REQUEST_T req, void (*call)(struct http_query_info*, void*), void* arg);
 
 void free_files(struct file_array* files);
 
diff --git a/src/request.h b/src/request.h
new file mode 100644
index 0000000..22b5ee5
--- /dev/null
+++ b/src/request.h
@@ -0,0 +1,28 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef REQUEST_H
+#define REQUEST_H
+
+#ifdef SINGLE_THREADED
+#define REQUEST_T void*
+#else
+#define REQUEST_T FCGX_Request*
+#endif
+
+#endif /* REQUEST_H */

From 67a2f90c8b4519326955f387fa348c621767c5c8 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 01:00:46 +0000
Subject: [PATCH 119/143] Add single-threaded NOOP

FossilOrigin-Name: 706225b5257311abdb37ed19ee3d4da2b2fe9cbf1aa88841f6f91b4ce66a4490
---
 src/global_perl.h |  6 ++++++
 src/main.c        | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/global_perl.h b/src/global_perl.h
index f821af4..476f160 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -50,8 +50,14 @@ extern PerlInterpreter* my_perl;
 extern HV* template_files;
 extern pthread_mutex_t perllock_mutex;
 
+#ifndef SINGLE_THREADED
 #define perl_lock() do { pthread_mutex_lock(&perllock_mutex); } while (0)
 #define perl_unlock() do { pthread_mutex_unlock(&perllock_mutex); } while (0)
+#else
+// NOOP
+#define perl_lock() ;;
+#define perl_unlock() ;;
+#endif
 
 #define ARG_UNDEFINED() do { XPUSHs(&PL_sv_undef); } while (0)
 
diff --git a/src/main.c b/src/main.c
index 48416f3..c4ed041 100644
--- a/src/main.c
+++ b/src/main.c
@@ -200,6 +200,14 @@ static void* threaded_fcgi_start(void* arg)
 
     return NULL;
 }
+#else
+void cgi_start(mastodont_t* api)
+{
+    while (FCGI_Accept() >= 0)
+    {
+        application(api, NULL);
+    }
+}
 #endif
 
 EXTERN_C void xs_init(pTHX)
@@ -238,15 +246,17 @@ int main(int argc, char **argv, char **env)
     pthread_t id[THREAD_COUNT];
 
     for (unsigned i = 0; i < THREAD_COUNT; ++i)
-        pthread_create(&id[i], NULL, cgi_start, &api);
+        pthread_create(&id[i], NULL, threaded_fcgi_start, &api);
 
     // Hell, let's not sit around here either
-threaded_fcgi_start(&api);
+    threaded_fcgi_start(&api);
     
     FCGX_ShutdownPending();
     
     for (unsigned i = 0; i < THREAD_COUNT; ++i)
         pthread_join(id[i], NULL);
+#else
+    cgi_start(&api);
 #endif
    
     free_instance_info_cache();

From 8d9d53703074de1204ffc2059ad381ce0e00d8a3 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 01:49:02 +0000
Subject: [PATCH 120/143] More single threaded macros

FossilOrigin-Name: 78ff7ba472d155fba3fe238e59193053b96dd2792b1b6ff7012ffe15cd4aec0e
---
 Makefile               |  4 ++++
 src/http.c             | 15 +++++++--------
 src/http.h             |  3 ++-
 src/local_config_set.c | 10 ++++------
 src/login.c            | 17 +++++++++--------
 src/path.c             |  4 ++--
 src/path.h             |  7 +------
 src/query.c            | 10 ++++++++--
 src/request.h          |  8 ++++++++
 src/status.c           | 10 ++--------
 10 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/Makefile b/Makefile
index c3b4497..499bf5d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,10 @@ MASTODONT_URL = https://fossil.nekobit.net/mastodont-c
 # Not parallel friendly
 #all: $(MASTODONT_DIR) dep_build $(TARGET)
 
+ifneq ($(strip $(SINGLE_THREADED)),)
+CFLAGS += -DSINGLE_THREADED
+endif
+
 all:
 	$(MAKE) dep_build
 	$(MAKE) filec
diff --git a/src/http.c b/src/http.c
index 8ce5b10..4611e29 100644
--- a/src/http.c
+++ b/src/http.c
@@ -27,15 +27,14 @@
 #define REDIR_HTML_END "</body>" \
     "</html>"
 
-void redirect(FCGX_Request* req, char* status, char* location)
+void redirect(REQUEST_T req, char* status, char* location)
 {
     char* loc_str = location ? location : "/";
     
-    FCGX_FPrintF(req->out,
-                 "Status: %s\r\n"
-                 "Location: %s\r\n\r\n"
-                 REDIR_HTML_BEGIN "Redirecting to <a href=\"\">%s</a>..." REDIR_HTML_END,
-                 status,
-                 loc_str,
-                 loc_str);
+    FPRINTF("Status: %s\r\n"
+            "Location: %s\r\n\r\n"
+            REDIR_HTML_BEGIN "Redirecting to <a href=\"\">%s</a>..." REDIR_HTML_END,
+            status,
+            loc_str,
+            loc_str);
 }
diff --git a/src/http.h b/src/http.h
index 403518c..ed6ec81 100644
--- a/src/http.h
+++ b/src/http.h
@@ -18,11 +18,12 @@
 
 #ifndef HTTP_H
 #define HTTP_H
+#include "request.h"
 #include <fcgi_stdio.h>
 #include <fcgiapp.h>
 
 #define REDIRECT_303 "303 See Other"
 
-void redirect(FCGX_Request* req, char* status, char* location);
+void redirect(REQUEST_T req, char* status, char* location);
 
 #endif // HTTP_H
diff --git a/src/local_config_set.c b/src/local_config_set.c
index b5eda48..81d5a32 100644
--- a/src/local_config_set.c
+++ b/src/local_config_set.c
@@ -34,9 +34,8 @@ void set_config_str(FCGX_Request* req,
     {
         if (ssn->post.set.is_set && post->is_set && page == curr_page)
         {
-            FCGX_FPrintF(req->out,
-                         "Set-Cookie: %s=%s; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
-                         cookie_name, keypstr(post));
+            FPRINTF("Set-Cookie: %s=%s; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
+                    cookie_name, keypstr(post));
         }
 
         if ((ssn->post.set.is_set && post->is_set) || cookie->is_set)
@@ -60,9 +59,8 @@ void set_config_int(FCGX_Request* req,
     {
         if (ssn->post.set.is_set && page == curr_page)
         {
-            FCGX_FPrintF(req->out,
-                         "Set-Cookie: %s=%d; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
-                         cookie_name, post_bool_intp(post));
+            FPRINTF("Set-Cookie: %s=%d; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
+                    cookie_name, post_bool_intp(post));
         } 
 
         // Checks if boolean option
diff --git a/src/login.c b/src/login.c
index 4c3f5fd..721296c 100644
--- a/src/login.c
+++ b/src/login.c
@@ -28,14 +28,15 @@
 #include "http.h"
 #include <curl/curl.h>
 #include <fcgi_stdio.h>
+#include "request.h"
 
 
 #define LOGIN_SCOPE "read+write+follow+push"
 
-void apply_access_token(FCGX_Request* req, char* token)
+static void apply_access_token(REQUEST_T req, char* token)
 {
-    FCGX_FPrintF(req->out, "Set-Cookie: access_token=%s; Path=/; Max-Age=31536000\r\n", token);
-    FCGX_FPrintF(req->out, "Set-Cookie: logged_in=t; Path=/; Max-Age=31536000\r\n");
+    FPRINTF("Set-Cookie: access_token=%s; Path=/; Max-Age=31536000\r\n", token);
+    PRINTF("Set-Cookie: logged_in=t; Path=/; Max-Age=31536000\r\n");
     // if config_url_prefix is empty, make it root
     redirect(req, REDIRECT_303, config_url_prefix &&
              config_url_prefix[0] != '\0' ? config_url_prefix : "/");
@@ -100,9 +101,9 @@ void content_login_oauth(PATH_ARGS)
                       decode_url, encode_id, urlify_redirect_url);
 
             // Set cookie and redirect
-            FCGX_FPrintF(req->out, "Set-Cookie: instance_url=%s; Path=/; Max-Age=3153600\r\n", decode_url);
-            FCGX_FPrintF(req->out, "Set-Cookie: client_id=%s; Path=/; Max-Age=3153600\r\n", app.client_id);
-            FCGX_FPrintF(req->out, "Set-Cookie: client_secret=%s; Path=/; Max-Age=3153600\r\n", app.client_secret);
+            FPRINTF("Set-Cookie: instance_url=%s; Path=/; Max-Age=3153600\r\n", decode_url);
+            FPRINTF("Set-Cookie: client_id=%s; Path=/; Max-Age=3153600\r\n", app.client_id);
+            FPRINTF("Set-Cookie: client_secret=%s; Path=/; Max-Age=3153600\r\n", app.client_secret);
             
             redirect(req, REDIRECT_303, url);
             free(url);
@@ -185,10 +186,10 @@ void content_login(PATH_ARGS)
             }
             else {
                 if (url_link)
-                    FCGX_FPrintF(req->out, "Set-Cookie: instance_url=%s; Path=/; Max-Age=31536000\r\n", url_link);
+                    FPRINTF("Set-Cookie: instance_url=%s; Path=/; Max-Age=31536000\r\n", url_link);
                 else
                     // Clear
-                    FCGX_FPrintF(req->out, "Set-Cookie: instance_url=; Path=/; Max-Age=-1\r\n");
+                    PRINTF("Set-Cookie: instance_url=; Path=/; Max-Age=-1\r\n");
 
                 apply_access_token(req, token.access_token);
                 free(url_link);
diff --git a/src/path.c b/src/path.c
index 0b2daec..8fa63e4 100644
--- a/src/path.c
+++ b/src/path.c
@@ -23,7 +23,7 @@
 #include "account.h"
 #include "error.h"
 
-int parse_path(FCGX_Request* req,
+int parse_path(REQUEST_T req,
                struct session* ssn,
                mastodont_t* api,
                struct path_info* path_info)
@@ -101,7 +101,7 @@ breakpt:
     return res;
 }
 
-void handle_paths(FCGX_Request* req,
+void handle_paths(REQUEST_T req,
                   struct session* ssn,
                   mastodont_t* api,
                   struct path_info* paths,
diff --git a/src/path.h b/src/path.h
index 2b0aceb..73856fe 100644
--- a/src/path.h
+++ b/src/path.h
@@ -35,12 +35,7 @@ struct path_info
 };
 
 void handle_paths(
-#ifdef SINGLE_THREADED
-    void*
-#else
-    FCGX_Request*
-#endif
-    req,
+    REQUEST_T req,
     struct session* ssn,
     mastodont_t* api,
     struct path_info* paths,
diff --git a/src/query.c b/src/query.c
index 5755a17..2978f23 100644
--- a/src/query.c
+++ b/src/query.c
@@ -143,7 +143,11 @@ char* read_post_data(REQUEST_T req, struct post_values* post)
         }
 
         // fread should be a macro to FCGI_fread, which is set by FCGI_Accept in previous definitions
+#ifndef SINGLE_THREADED
         size_t len = FCGX_GetStr(post_query, content_length, req->in);
+#else
+        size_t len = fread(post_query, 1, content_length, stdin);
+#endif
         post_query[content_length] = '\0';
 
         // For shifting through
@@ -229,10 +233,12 @@ char* try_handle_post(REQUEST_T req, void (*call)(struct http_query_info*, void*
             return NULL;
         }
 #ifdef SINGLE_THREADED
-        read(STDIN_FILENO, post_query, content_length);
+        int size = read(STDIN_FILENO, post_query, content_length);
 #else
-        FCGX_GetStr(post_query, content_length, req->in);
+        int size = FCGX_GetStr(post_query, content_length, req->in);
 #endif
+        if (size != content_length)
+            return NULL;
         post_query[content_length] = '\0';
         
 
diff --git a/src/request.h b/src/request.h
index 22b5ee5..936086a 100644
--- a/src/request.h
+++ b/src/request.h
@@ -20,8 +20,16 @@
 #define REQUEST_H
 
 #ifdef SINGLE_THREADED
+#else
+#endif
+
+#ifdef SINGLE_THREADED
+#define FPRINTF(str, ...) fprintf(str, __VA_ARGS__)
+#define PRINTF(str) printf(str)
 #define REQUEST_T void*
 #else
+#define FPRINTF(str, ...) FCGX_FPrintF(req->out, str, __VA_ARGS__)
+#define PRINTF(str) FCGX_PrintF(req->out, str)
 #define REQUEST_T FCGX_Request*
 #endif
 
diff --git a/src/status.c b/src/status.c
index 60a9fb5..e092e38 100644
--- a/src/status.c
+++ b/src/status.c
@@ -221,14 +221,8 @@ void status_interact(PATH_ARGS)
     char* referer = GET_ENV("HTTP_REFERER", req);
     
     try_interact_status(ssn, api, data[0]);
-    
-    FCGX_FPrintF(req->out,
-                 "Status: 303 See Other\r\n"
-                 "Location: %s#id-%s\r\n"
-                 "Content-Length: 14\r\n\r\n"
-                 "Redirecting...",
-                 referer ? referer : "/",
-                 data[0]);
+
+    redirect(req, REDIRECT_303, referer);
 }
 
 void api_status_interact(PATH_ARGS)

From 8d225b2c860e0cb017d4e53f08886d71a7b0211a Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 11:53:58 +0000
Subject: [PATCH 121/143] Fix FCGX app issues

FossilOrigin-Name: 0d15195d046dd622b4b10fa5979872781b088b22f4f8528cea3a442439c9d41e
---
 src/base_page.c        |  2 +-
 src/cgi.h              | 30 ++++++++++++++++++++++++++++++
 src/cookie.h           |  3 +--
 src/http.h             |  3 +--
 src/local_config_set.h |  3 +--
 src/login.c            |  3 +--
 src/main.c             |  3 +--
 src/notifications.h    |  3 +--
 src/page_config.h      |  3 +--
 src/path.h             |  3 +--
 src/query.c            |  4 ++--
 src/request.h          |  9 +++------
 src/search.c           |  2 +-
 src/timeline.h         | 16 ++++++++--------
 14 files changed, 53 insertions(+), 34 deletions(-)
 create mode 100644 src/cgi.h

diff --git a/src/base_page.c b/src/base_page.c
index 3bdd1a7..390406c 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -27,7 +27,7 @@
 #include "../config.h"
 #include "local_config_set.h"
 #include "account.h"
-#include <fcgi_stdio.h>
+#include "cgi.h"
 #include "global_cache.h"
 
 #define BODY_STYLE "style=\"background:url('%s');\""
diff --git a/src/cgi.h b/src/cgi.h
new file mode 100644
index 0000000..e0d2307
--- /dev/null
+++ b/src/cgi.h
@@ -0,0 +1,30 @@
+/*
+ * Treebird - Lightweight frontend for Pleroma
+ * Copyright (C) 2022 Nekobit
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* #ifndef IMPORT_CGI_H */
+/* #define IMPORT_CGI_H */
+
+#ifndef NO_FCGI
+#include <fcgi_stdio.h>
+#endif // NO_FCGI
+
+#ifndef SINGLE_THREADED
+#include <fcgiapp.h>
+#endif // SINGLE_THREADED
+
+// #endif
diff --git a/src/cookie.h b/src/cookie.h
index b462427..c40c1b7 100644
--- a/src/cookie.h
+++ b/src/cookie.h
@@ -21,8 +21,7 @@
 #include <stddef.h>
 #include "global_perl.h"
 #include "key.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
 #include "request.h"
 
 struct cookie_values
diff --git a/src/http.h b/src/http.h
index ed6ec81..67847c2 100644
--- a/src/http.h
+++ b/src/http.h
@@ -19,8 +19,7 @@
 #ifndef HTTP_H
 #define HTTP_H
 #include "request.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
 
 #define REDIRECT_303 "303 See Other"
 
diff --git a/src/local_config_set.h b/src/local_config_set.h
index c3be2c7..ab0d0b8 100644
--- a/src/local_config_set.h
+++ b/src/local_config_set.h
@@ -23,8 +23,7 @@
 #include "attachments.h"
 #include "local_config.h"
 #include "key.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
 
 enum config_page
 {
diff --git a/src/login.c b/src/login.c
index 721296c..3cd7ff6 100644
--- a/src/login.c
+++ b/src/login.c
@@ -27,10 +27,9 @@
 #include "../config.h"
 #include "http.h"
 #include <curl/curl.h>
-#include <fcgi_stdio.h>
+#include "cgi.h"
 #include "request.h"
 
-
 #define LOGIN_SCOPE "read+write+follow+push"
 
 static void apply_access_token(REQUEST_T req, char* token)
diff --git a/src/main.c b/src/main.c
index c4ed041..4e2b0b9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,9 +44,8 @@
 #include "local_config_set.h"
 #include "global_cache.h"
 #include "conversations.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
 #include "request.h"
+#include "cgi.h"
 
 #define THREAD_COUNT 20
 
diff --git a/src/notifications.h b/src/notifications.h
index 8df3ab5..1fa623f 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -19,11 +19,10 @@
 #ifndef NOTIFICATIONS_H
 #define NOTIFICATIONS_H
 #include <mastodont.h>
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
 #include "session.h"
 #include "path.h"
 #include "global_perl.h"
+#include "cgi.h"
 
 // Page contents
 void content_notifications(PATH_ARGS);
diff --git a/src/page_config.h b/src/page_config.h
index e4f15d3..5152755 100644
--- a/src/page_config.h
+++ b/src/page_config.h
@@ -22,8 +22,7 @@
 #include <mastodont.h>
 #include "path.h"
 #include "session.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
 
 void content_config_appearance(PATH_ARGS);
 void content_config_general(PATH_ARGS);
diff --git a/src/path.h b/src/path.h
index 73856fe..407e0ab 100644
--- a/src/path.h
+++ b/src/path.h
@@ -22,8 +22,7 @@
 #include <mastodont.h>
 #include <stddef.h>
 #include "env.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
 #include "request.h"
 
 #define PATH_ARGS REQUEST_T req, struct session* ssn, mastodont_t* api, char** data
diff --git a/src/query.c b/src/query.c
index 2978f23..3763536 100644
--- a/src/query.c
+++ b/src/query.c
@@ -23,8 +23,8 @@
 #include <unistd.h>
 #include "env.h"
 #include "mime.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
+
 
 char* read_get_data(REQUEST_T req, struct get_values* query)
 {
diff --git a/src/request.h b/src/request.h
index 936086a..3dd67f8 100644
--- a/src/request.h
+++ b/src/request.h
@@ -19,17 +19,14 @@
 #ifndef REQUEST_H
 #define REQUEST_H
 
-#ifdef SINGLE_THREADED
-#else
-#endif
-
 #ifdef SINGLE_THREADED
 #define FPRINTF(str, ...) fprintf(str, __VA_ARGS__)
-#define PRINTF(str) printf(str)
+#define PRINTF(str) puts(str)
 #define REQUEST_T void*
 #else
 #define FPRINTF(str, ...) FCGX_FPrintF(req->out, str, __VA_ARGS__)
-#define PRINTF(str) FCGX_PrintF(req->out, str)
+// If this adds a newline (it shouldn't) then this is probably
+#define PRINTF(str) FCGX_PutS(req->out, str)
 #define REQUEST_T FCGX_Request*
 #endif
 
diff --git a/src/search.c b/src/search.c
index cf407f0..b46dadc 100644
--- a/src/search.c
+++ b/src/search.c
@@ -17,9 +17,9 @@
  */
 
 #include <stdlib.h>
+#include "search.h"
 #include "http.h"
 #include "helpers.h"
-#include "search.h"
 #include "easprintf.h"
 #include "../config.h"
 #include "string_helpers.h"
diff --git a/src/timeline.h b/src/timeline.h
index 24017a7..a4e58f4 100644
--- a/src/timeline.h
+++ b/src/timeline.h
@@ -23,23 +23,23 @@
 #include "path.h"
 #include "session.h"
 #include "base_page.h"
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
+#include "cgi.h"
+#include "request.h"
 
 /** Wrapper for content_tl_federated */
-void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local);
+void tl_home(REQUEST_T req, struct session* ssn, mastodont_t* api, int local);
 
 /** Wrapper for content_tl_direct */
-void tl_direct(FCGX_Request* req, struct session* ssn, mastodont_t* api);
+void tl_direct(REQUEST_T req, struct session* ssn, mastodont_t* api);
 
 /** Wrapper for content_tl_federated */
-void tl_public(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local, enum base_category cat);
+void tl_public(REQUEST_T req, struct session* ssn, mastodont_t* api, int local, enum base_category cat);
 
 /** Wrapper for content_tl_list */
-void tl_list(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* list_id);
+void tl_list(REQUEST_T req, struct session* ssn, mastodont_t* api, char* list_id);
 
 /** Wrapper for content_tl_tag */
-void tl_tag(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* tag);
+void tl_tag(REQUEST_T req, struct session* ssn, mastodont_t* api, char* tag);
 
 /* ------------------------------------------------ */
 
@@ -78,7 +78,7 @@ void content_tl_tag(PATH_ARGS);
  * @param header A header that is displayed above the timeline.
  * @param show_post_box If the post box should be shown or not.
  */
-void content_timeline(FCGX_Request* req,
+void content_timeline(REQUEST_T req,
                       struct session* ssn,
                       mastodont_t* api,
                       struct mstdnt_storage* storage,

From 06867d36f504b92147e1b5962ede3dc91714ebd1 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 12:18:54 +0000
Subject: [PATCH 122/143] Fix FCGX usage

FossilOrigin-Name: 20d5a7ce7f9a7ed9b1c18ba0f28e264f5a09c57034a05287687be529aa0849cd
---
 src/request.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/request.h b/src/request.h
index 3dd67f8..2aa7880 100644
--- a/src/request.h
+++ b/src/request.h
@@ -26,7 +26,7 @@
 #else
 #define FPRINTF(str, ...) FCGX_FPrintF(req->out, str, __VA_ARGS__)
 // If this adds a newline (it shouldn't) then this is probably
-#define PRINTF(str) FCGX_PutS(req->out, str)
+#define PRINTF(str) FCGX_PutS(str, req->out)
 #define REQUEST_T FCGX_Request*
 #endif
 

From 62e782c8f7a94349de6981e13126d2cb8690579c Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 12:36:19 +0000
Subject: [PATCH 123/143] Fix macros

\nWe could use __VA_OPT__(,), but this is for a very new version of GCC

FossilOrigin-Name: cd18b7747d55d6251bcabad7350629303e313b0f053a06a41fa7b188969b2071
---
 src/http.c             | 12 ++++++------
 src/local_config_set.c |  4 ++--
 src/login.c            | 14 +++++++-------
 src/request.h          |  9 ++++-----
 src/timeline.c         | 12 ++++++------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/http.c b/src/http.c
index 4611e29..a93d477 100644
--- a/src/http.c
+++ b/src/http.c
@@ -31,10 +31,10 @@ void redirect(REQUEST_T req, char* status, char* location)
 {
     char* loc_str = location ? location : "/";
     
-    FPRINTF("Status: %s\r\n"
-            "Location: %s\r\n\r\n"
-            REDIR_HTML_BEGIN "Redirecting to <a href=\"\">%s</a>..." REDIR_HTML_END,
-            status,
-            loc_str,
-            loc_str);
+    PRINTF("Status: %s\r\n"
+           "Location: %s\r\n\r\n"
+           REDIR_HTML_BEGIN "Redirecting to <a href=\"\">%s</a>..." REDIR_HTML_END,
+           status,
+           loc_str,
+           loc_str);
 }
diff --git a/src/local_config_set.c b/src/local_config_set.c
index 81d5a32..595f6d0 100644
--- a/src/local_config_set.c
+++ b/src/local_config_set.c
@@ -34,7 +34,7 @@ void set_config_str(FCGX_Request* req,
     {
         if (ssn->post.set.is_set && post->is_set && page == curr_page)
         {
-            FPRINTF("Set-Cookie: %s=%s; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
+            PRINTF("Set-Cookie: %s=%s; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
                     cookie_name, keypstr(post));
         }
 
@@ -59,7 +59,7 @@ void set_config_int(FCGX_Request* req,
     {
         if (ssn->post.set.is_set && page == curr_page)
         {
-            FPRINTF("Set-Cookie: %s=%d; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
+            PRINTF("Set-Cookie: %s=%d; HttpOnly; Path=/; Max-Age=31536000; SameSite=Strict;\r\n",
                     cookie_name, post_bool_intp(post));
         } 
 
diff --git a/src/login.c b/src/login.c
index 3cd7ff6..077ca11 100644
--- a/src/login.c
+++ b/src/login.c
@@ -34,8 +34,8 @@
 
 static void apply_access_token(REQUEST_T req, char* token)
 {
-    FPRINTF("Set-Cookie: access_token=%s; Path=/; Max-Age=31536000\r\n", token);
-    PRINTF("Set-Cookie: logged_in=t; Path=/; Max-Age=31536000\r\n");
+    PRINTF("Set-Cookie: access_token=%s; Path=/; Max-Age=31536000\r\n", token);
+    PUT("Set-Cookie: logged_in=t; Path=/; Max-Age=31536000\r\n");
     // if config_url_prefix is empty, make it root
     redirect(req, REDIRECT_303, config_url_prefix &&
              config_url_prefix[0] != '\0' ? config_url_prefix : "/");
@@ -100,9 +100,9 @@ void content_login_oauth(PATH_ARGS)
                       decode_url, encode_id, urlify_redirect_url);
 
             // Set cookie and redirect
-            FPRINTF("Set-Cookie: instance_url=%s; Path=/; Max-Age=3153600\r\n", decode_url);
-            FPRINTF("Set-Cookie: client_id=%s; Path=/; Max-Age=3153600\r\n", app.client_id);
-            FPRINTF("Set-Cookie: client_secret=%s; Path=/; Max-Age=3153600\r\n", app.client_secret);
+            PRINTF("Set-Cookie: instance_url=%s; Path=/; Max-Age=3153600\r\n", decode_url);
+            PRINTF("Set-Cookie: client_id=%s; Path=/; Max-Age=3153600\r\n", app.client_id);
+            PRINTF("Set-Cookie: client_secret=%s; Path=/; Max-Age=3153600\r\n", app.client_secret);
             
             redirect(req, REDIRECT_303, url);
             free(url);
@@ -185,10 +185,10 @@ void content_login(PATH_ARGS)
             }
             else {
                 if (url_link)
-                    FPRINTF("Set-Cookie: instance_url=%s; Path=/; Max-Age=31536000\r\n", url_link);
+                    PRINTF("Set-Cookie: instance_url=%s; Path=/; Max-Age=31536000\r\n", url_link);
                 else
                     // Clear
-                    PRINTF("Set-Cookie: instance_url=; Path=/; Max-Age=-1\r\n");
+                    PUT("Set-Cookie: instance_url=; Path=/; Max-Age=-1\r\n");
 
                 apply_access_token(req, token.access_token);
                 free(url_link);
diff --git a/src/request.h b/src/request.h
index 2aa7880..ccbeffd 100644
--- a/src/request.h
+++ b/src/request.h
@@ -20,13 +20,12 @@
 #define REQUEST_H
 
 #ifdef SINGLE_THREADED
-#define FPRINTF(str, ...) fprintf(str, __VA_ARGS__)
-#define PRINTF(str) puts(str)
+#define PRINTF(str, ...) printf(str, __VA_ARGS__)
+#define PUT(str) printf(str)
 #define REQUEST_T void*
 #else
-#define FPRINTF(str, ...) FCGX_FPrintF(req->out, str, __VA_ARGS__)
-// If this adds a newline (it shouldn't) then this is probably
-#define PRINTF(str) FCGX_PutS(str, req->out)
+#define PRINTF(str, ...) FCGX_FPrintF(req->out, str, __VA_ARGS__)
+#define PUT(str) FCGX_FPrintF(req->out, str)
 #define REQUEST_T FCGX_Request*
 #endif
 
diff --git a/src/timeline.c b/src/timeline.c
index d6151af..3802db4 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -30,7 +30,7 @@
 #include "error.h"
 #include "string_helpers.h"
 
-void content_timeline(FCGX_Request* req,
+void content_timeline(REQUEST_T req,
                       struct session* ssn,
                       mastodont_t* api,
                       struct mstdnt_storage* storage,
@@ -78,7 +78,7 @@ void content_timeline(FCGX_Request* req,
     Safefree(dup);
 }
 
-void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local)
+void tl_home(REQUEST_T req, struct session* ssn, mastodont_t* api, int local)
 {
     struct mstdnt_args m_args = { 0 };
     set_mstdnt_args(&m_args, ssn);
@@ -109,7 +109,7 @@ void tl_home(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local
     content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_HOME, NULL, 1, 0);
 }
 
-void tl_direct(FCGX_Request* req, struct session* ssn, mastodont_t* api)
+void tl_direct(REQUEST_T req, struct session* ssn, mastodont_t* api)
 {
     struct mstdnt_args m_args = { 0 };
     set_mstdnt_args(&m_args, ssn);
@@ -137,7 +137,7 @@ void tl_direct(FCGX_Request* req, struct session* ssn, mastodont_t* api)
     content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_DIRECT, "Direct", 0, 0);
 }
 
-void tl_public(FCGX_Request* req, struct session* ssn, mastodont_t* api, int local, enum base_category cat)
+void tl_public(REQUEST_T req, struct session* ssn, mastodont_t* api, int local, enum base_category cat)
 {
     struct mstdnt_args m_args = { 0 };
     set_mstdnt_args(&m_args, ssn);
@@ -167,7 +167,7 @@ void tl_public(FCGX_Request* req, struct session* ssn, mastodont_t* api, int loc
     content_timeline(req, ssn, api, &storage, statuses, statuses_len, cat, NULL, 1, 0);
 }
 
-void tl_list(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* list_id)
+void tl_list(REQUEST_T req, struct session* ssn, mastodont_t* api, char* list_id)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);
@@ -195,7 +195,7 @@ void tl_list(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* lis
 }
 
 
-void tl_tag(FCGX_Request* req, struct session* ssn, mastodont_t* api, char* tag_id)
+void tl_tag(REQUEST_T req, struct session* ssn, mastodont_t* api, char* tag_id)
 {
     struct mstdnt_args m_args;
     set_mstdnt_args(&m_args, ssn);

From d7d52a0a1ff549eb7ebcbf01b1bb2862def1fcd1 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 13:51:39 +0000
Subject: [PATCH 124/143] DEV Docs

FossilOrigin-Name: e52ecf9d629ce54fd9f6bcd0947b7817a3c9206f21da888525381607d952c9a4
---
 docs/DEVELOP.md | 11 +++++++++++
 docs/INSTALL.md | 14 ++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 docs/DEVELOP.md

diff --git a/docs/DEVELOP.md b/docs/DEVELOP.md
new file mode 100644
index 0000000..c7a0ca0
--- /dev/null
+++ b/docs/DEVELOP.md
@@ -0,0 +1,11 @@
+# Developing Treebird
+
+Treebird development is a bit hacky. There are better ways to work with development
+
+### Compiler flags
+
+You can compile Treebird with some helpful flags, such as single_threaded to improve debugging for Treebird.
+
+```
+make SINGLE_THREADED=1 all
+```
\ No newline at end of file
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index e83fc9c..eb84be6 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -35,7 +35,6 @@ If that doesn't work, you can open a CPAN shell
 ```
 perl -MCPAN -e shell
 install Template::Toolkit
-install HTML::Escape
 ```
 
 ## Installation
@@ -47,15 +46,14 @@ If this succeeds (assuming you used default variables), you can now find Treebir
 - `/usr/local/share/treebird/` - Contains CSS, images, and other meta files
 - `/usr/local/bin/treebird` - Regular executable CGI file, test it by running it as is, it shouldn't spit anything out
 
-### Using NGINX
+## Development
+
+For developing Treebird, see `DEVELOP.md`.
+
+## Nginx
 
 Treebird can be served over nginx by using a FastCGI daemon such as spawn-fcgi.
 
-The example static files will be in `/usr/local/share/treebird/`, with `treebird.cgi` at `/usr/local/bin/treebird`.
-
-After running `make`, Treebird's files will be in the `dist/` directory. _Copy_, ***DO NOT MOVE***, **everything but treebird.cgi** of this folder to your web server. Copy `treebird.cgi` to another directory of your choosing.
-
-## Nginx
 An example Nginx configuration is available in [treebird.nginx.conf](./sample/treebird.nginx.conf).
 * Make sure to change `example.com` to your instance's domain.
 * Make sure to change the `root` to wherever the static files are being stored
@@ -65,7 +63,7 @@ An example Nginx configuration is available in [treebird.nginx.conf](./sample/tr
 Apache hasn't caused many troubles, and is in fact, what I use for development. You can see how to start
 spawn-fcgi in `scripts/fcgistarter.sh`.
 
-Example Apache configuration is available in [treebird.apache.conf](./sample/treebird.apache.conf).
+An example Apache configuration is available in [treebird.apache.conf](./sample/treebird.apache.conf).
 
 #### spawn-fcgi
 

From 1b80b589b755543f86fe5849e2992ad057684d15 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 13:59:48 +0000
Subject: [PATCH 125/143] Debug options

FossilOrigin-Name: 00a884ba50b3a7a8d5e002ab07eef2430a705d60c789fa434a578c8f73920134
---
 Makefile   |  4 ++++
 src/main.c | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Makefile b/Makefile
index 499bf5d..9340e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,10 @@ ifneq ($(strip $(SINGLE_THREADED)),)
 CFLAGS += -DSINGLE_THREADED
 endif
 
+ifneq ($(strip $(SINGLE_THREADED)),)
+CFLAGS += -DDEBUG
+endif
+
 all:
 	$(MAKE) dep_build
 	$(MAKE) filec
diff --git a/src/main.c b/src/main.c
index 4e2b0b9..2a58434 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,6 +54,13 @@ static void xs_init (pTHX);
 
 EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
+#ifdef DEBUG
+static void exit_treebird(PATH_ARGS)
+{
+    exit(0);
+}
+#endif
+
 /*******************
  *  Path handling  *
  ******************/
@@ -109,6 +116,10 @@ static struct path_info paths[] = {
     { "/tag/:", content_tl_tag },
     { "/chats/:", content_chat_view },
     { "/chats", content_chats },
+#ifdef DEBUG
+    { "/quit", exit_treebird },
+    { "/exit", exit_treebird },
+#endif
     // API
     { "/treebird_api/v1/notifications", api_notifications },
     { "/treebird_api/v1/interact", api_status_interact },

From bebc9eb58b417e1da64853e1451d058e9db1cee7 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 17:12:41 +0000
Subject: [PATCH 126/143] Memory improvements

FossilOrigin-Name: 74d721f05bd0cb5fd53a5fff34258113afc9087f2083688f733bc3fe5b32e323
---
 src/base_page.c     | 8 ++++----
 src/main.c          | 5 +++--
 src/notifications.c | 7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/base_page.c b/src/base_page.c
index 390406c..420cb1d 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -70,16 +70,16 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     PERL_STACK_INIT;
 
     if (page->session)
-        mXPUSHs(newRV_inc((SV*)page->session));
+        mXPUSHs(newRV_noinc((SV*)page->session));
     else
-        mXPUSHs(newRV_inc((SV*)perlify_session(ssn)));
-    XPUSHs(newRV_inc((SV*)template_files));
+        mXPUSHs(newRV_noinc((SV*)perlify_session(ssn)));
+    XPUSHs(newRV_noinc((SV*)template_files));
     XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
 
     if (notifs && notifs_len)
     {
         AV* notifs_av = perlify_notifications(notifs, notifs_len);
-        XPUSHs(sv_2mortal(newRV_inc((SV*)notifs_av)));
+        mXPUSHs(newRV_inc((SV*)notifs_av));
     }
     else XPUSHs(&PL_sv_undef);
     
diff --git a/src/main.c b/src/main.c
index 2a58434..801b6aa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,9 +55,10 @@ static void xs_init (pTHX);
 EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
 #ifdef DEBUG
+static int quit = 0;
 static void exit_treebird(PATH_ARGS)
 {
-    exit(0);
+    quit = 1;
 }
 #endif
 
@@ -213,7 +214,7 @@ static void* threaded_fcgi_start(void* arg)
 #else
 void cgi_start(mastodont_t* api)
 {
-    while (FCGI_Accept() >= 0)
+    while (FCGI_Accept() >= 0 && quit == 0)
     {
         application(api, NULL);
     }
diff --git a/src/notifications.c b/src/notifications.c
index e5bdf9d..51f4166 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -111,11 +111,11 @@ void content_notifications_compact(PATH_ARGS)
 
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_noinc((SV*)session_hv));
+    mXPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (notifs)
-        XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
-    
+        mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
+
     PERL_STACK_SCALAR_CALL("notifications::embed_notifications");
 
     page = PERL_GET_STACK_EXIT;
@@ -124,6 +124,7 @@ void content_notifications_compact(PATH_ARGS)
 
     mastodont_storage_cleanup(&storage);
     mstdnt_cleanup_notifications(notifs, notifs_len);
+    Safefree(page);
 }
 
 void content_notifications_clear(PATH_ARGS)

From 9efd9f9a9fc2f2e7c3648bd82ad9ddb90d9bcfa2 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 24 Aug 2022 23:57:18 +0000
Subject: [PATCH 127/143] Cleanup Perl runtime leaks

FossilOrigin-Name: 5081c19df88f2dfca0ef18710c47f906de3104a1411275c7826965faf6479317
---
 Makefile            |  4 ++--
 src/account.c       | 18 +++++++++---------
 src/base_page.c     |  8 +++-----
 src/conversations.c |  2 +-
 src/emoji.c         |  2 +-
 src/global_perl.h   |  4 ++--
 src/lists.c         |  2 +-
 src/login.c         |  2 +-
 src/main.c          | 16 +++++++++++-----
 src/notifications.c |  2 +-
 src/search.c        | 12 ++++++++----
 src/status.c        | 12 ++++++------
 src/timeline.c      |  4 ++--
 13 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/Makefile b/Makefile
index 9340e2a..bee0cf0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ GIT ?= git
 MASTODONT_DIR = mastodont-c/
 MASTODONT = $(MASTODONT_DIR)libmastodont.a
 CFLAGS += -Wall -I $(MASTODONT_DIR)include/ -Wno-unused-variable -Wno-ignored-qualifiers -I/usr/include/ -I $(MASTODONT_DIR)/libs $(shell pkg-config --cflags libcurl libpcre2-8) `perl -MExtUtils::Embed -e ccopts`
-LDFLAGS = -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpcre2-8) -lfcgi -lpthread `perl -MExtUtils::Embed -e ldopts`
+LDFLAGS += -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpcre2-8) -lfcgi -lpthread `perl -MExtUtils::Embed -e ldopts`
 SRC = $(wildcard src/*.c)
 OBJ = $(patsubst %.c,%.o,$(SRC))
 HEADERS = $(wildcard src/*.h) config.h
@@ -45,7 +45,7 @@ $(TARGET): $(HEADERS) $(OBJ)
 	$(CC) -o $(TARGET) $(OBJ) $(PAGES_C_OBJ) $(LDFLAGS)
 
 filec: src/file-to-c/main.o
-	$(CC) -o filec $<
+	$(CC) $(LDFLAGS) -o filec $<
 
 emojitoc: scripts/emoji-to.o
 	$(CC) -o emojitoc $< $(LDFLAGS)
diff --git a/src/account.c b/src/account.c
index 5c67bf7..631e21b 100644
--- a/src/account.c
+++ b/src/account.c
@@ -58,14 +58,14 @@ static char* accounts_page(HV* session_hv,
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (acct)
-        XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+        mXPUSHs(newRV_noinc((SV*)perlify_account(acct)));
     else ARG_UNDEFINED();
     if (rel)
-        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+        mXPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
     else ARG_UNDEFINED();
     
     if (accts && accts_len)
-        XPUSHs(newRV_noinc((SV*)perlify_accounts(accts, accts_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_accounts(accts, accts_len)));
     else ARG_UNDEFINED();
 
     // perlapi doesn't specify if a string length of 0 calls strlen so calling just to be safe...
@@ -158,13 +158,13 @@ static char* account_statuses_cb(HV* session_hv,
     PERL_STACK_INIT;
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    mXPUSHs(newRV_noinc((SV*)perlify_account(acct)));
     if (rel)
-        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+        mXPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
     else ARG_UNDEFINED();
     
     if (statuses && statuses_len)
-        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
     else ARG_UNDEFINED();
 
     PERL_STACK_SCALAR_CALL("account::content_statuses");
@@ -203,13 +203,13 @@ static char* account_scrobbles_cb(HV* session_hv,
     PERL_STACK_INIT;
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_account(acct)));
+    mXPUSHs(newRV_noinc((SV*)perlify_account(acct)));
     if (rel)
-        XPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
+        mXPUSHs(newRV_noinc((SV*)perlify_relationship(rel)));
     else ARG_UNDEFINED();
     
     if (scrobbles && scrobbles_len)
-        XPUSHs(newRV_noinc((SV*)perlify_scrobbles(scrobbles, scrobbles_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_scrobbles(scrobbles, scrobbles_len)));
     else ARG_UNDEFINED();
 
     PERL_STACK_SCALAR_CALL("account::content_scrobbles");
diff --git a/src/base_page.c b/src/base_page.c
index 420cb1d..4ef0ed9 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -74,14 +74,13 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     else
         mXPUSHs(newRV_noinc((SV*)perlify_session(ssn)));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(sv_2mortal(newSVpv(page->content, 0)));
+    mXPUSHs(newSVpv(page->content, 0));
 
     if (notifs && notifs_len)
     {
-        AV* notifs_av = perlify_notifications(notifs, notifs_len);
-        mXPUSHs(newRV_inc((SV*)notifs_av));
+        mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     }
-    else XPUSHs(&PL_sv_undef);
+    else ARG_UNDEFINED();
     
     // Run function
     PERL_STACK_SCALAR_CALL("base_page");
@@ -89,7 +88,6 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     
     send_result(req, NULL, "text/html", dup, 0);
     
-    
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
     Safefree(dup);
diff --git a/src/conversations.c b/src/conversations.c
index 361e9ff..2dd686e 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -50,7 +50,7 @@ void content_chats(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (chats)
-        XPUSHs(newRV_noinc((SV*)perlify_chats(chats, chats_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_chats(chats, chats_len)));
     else ARG_UNDEFINED();
 
     PERL_STACK_SCALAR_CALL("chat::content_chats");
diff --git a/src/emoji.c b/src/emoji.c
index 58b0d79..3a7025a 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -112,7 +112,7 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     {
         av_store(av, i, newSVpv(emojis[i], 0));
     }
-    XPUSHs(newRV_noinc((SV*)av));
+    mXPUSHs(newRV_noinc((SV*)av));
     PERL_STACK_SCALAR_CALL("emojis::emoji_picker");
 
     char* dup = PERL_GET_STACK_EXIT;
diff --git a/src/global_perl.h b/src/global_perl.h
index 476f160..74e3bb9 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -26,7 +26,7 @@
 #define hvstores_str(hv, key, val) hv_stores((hv), key, ((val) ? newSVpv((val), 0) : &PL_sv_undef))
 #define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
 #define hvstores_ref(hv, key, val) hv_stores((hv), key,                 \
-                                             ((val) ? newRV_inc((SV* const)(val)) : &PL_sv_undef))
+                                             ((val) ? newRV_noinc((SV* const)(val)) : &PL_sv_undef))
 
 /* Seeing all this shit littered in Treebird's code made me decide to write some macros */
 #define PERL_STACK_INIT perl_lock(); \
@@ -59,7 +59,7 @@ extern pthread_mutex_t perllock_mutex;
 #define perl_unlock() ;;
 #endif
 
-#define ARG_UNDEFINED() do { XPUSHs(&PL_sv_undef); } while (0)
+#define ARG_UNDEFINED() do { mXPUSHs(&PL_sv_undef); } while (0)
 
 void init_template_files(pTHX);
 void cleanup_template_files();
diff --git a/src/lists.c b/src/lists.c
index 225133c..93108cf 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -56,7 +56,7 @@ void content_lists(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (lists)
-        XPUSHs(newRV_noinc((SV*)perlify_lists(lists, lists_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_lists(lists, lists_len)));
     
     PERL_STACK_SCALAR_CALL("lists::content_lists");
 
diff --git a/src/login.c b/src/login.c
index 077ca11..a5ce912 100644
--- a/src/login.c
+++ b/src/login.c
@@ -209,7 +209,7 @@ void content_login(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (storage.error || oauth_store.error)
-        XPUSHs(newSVpv(storage.error ? storage.error : oauth_store.error, 0));
+        mXPUSHs(newSVpv(storage.error ? storage.error : oauth_store.error, 0));
 
     PERL_STACK_SCALAR_CALL("login::content_login");
 
diff --git a/src/main.c b/src/main.c
index 801b6aa..6df0d1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,14 +51,14 @@
 
 // Allow dynamic loading for Perl
 static void xs_init (pTHX);
-
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
+void boot_DynaLoader (pTHX_ CV* cv);
 
 #ifdef DEBUG
 static int quit = 0;
 static void exit_treebird(PATH_ARGS)
 {
     quit = 1;
+    exit(1);
 }
 #endif
 
@@ -221,17 +221,22 @@ void cgi_start(mastodont_t* api)
 }
 #endif
 
-EXTERN_C void xs_init(pTHX)
+void xs_init(pTHX)
 {
-       char *file = __FILE__;
-       newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+    static const char file[] = __FILE__;
+    dXSUB_SYS;
+    PERL_UNUSED_CONTEXT;
+    
+    newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
 
 int main(int argc, char **argv, char **env)
 {
     // Global init
     mastodont_global_curl_init();
+#ifndef SINGLE_THREADED
     FCGX_Init();
+#endif
 
     // Initialize Perl
     PERL_SYS_INIT3(&argc, &argv, &env);
@@ -242,6 +247,7 @@ int main(int argc, char **argv, char **env)
 
     perl_parse(my_perl, xs_init, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
     PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+    PL_perl_destruct_level = 2;
     perl_run(my_perl);
 
     init_template_files(aTHX);
diff --git a/src/notifications.c b/src/notifications.c
index 51f4166..9eeecc7 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -61,7 +61,7 @@ void content_notifications(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (notifs)
-        XPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     
     // ARGS
     PERL_STACK_SCALAR_CALL("notifications::content_notifications");
diff --git a/src/search.c b/src/search.c
index b46dadc..71fb3d9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -70,6 +70,7 @@ void content_search_all(PATH_ARGS)
             redirect(req, REDIRECT_303, url);
             break;
         }
+        free(url);
         curl_free(query);
         return;
     }
@@ -80,7 +81,7 @@ void content_search_all(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
+    mXPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
     
     PERL_STACK_SCALAR_CALL("search::content_search");
 
@@ -95,7 +96,7 @@ void content_search_all(PATH_ARGS)
     };
 
     render_base_page(&b, req, ssn, api);
-    
+
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
     Safefree(dup);
@@ -127,7 +128,8 @@ void content_search_statuses(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
+    mXPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
+    
     PERL_STACK_SCALAR_CALL("search::content_search_statuses");
 
     // Duplicate so we can free the TMPs
@@ -172,7 +174,7 @@ void content_search_accounts(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
+    mXPUSHs(newRV_noinc((SV*)perlify_search_results(&results)));
     
     PERL_STACK_SCALAR_CALL("search::content_search_accounts");
 
@@ -190,6 +192,7 @@ void content_search_accounts(PATH_ARGS)
     
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
+    Safefree(dup);
 }
 
 void content_search_hashtags(PATH_ARGS)
@@ -217,6 +220,7 @@ void content_search_hashtags(PATH_ARGS)
     
     mstdnt_cleanup_search_results(&results);
     mastodont_storage_cleanup(&storage);
+//    Safefree(dup);
 }
 
 HV* perlify_search_results(struct mstdnt_search_results* results)
diff --git a/src/status.c b/src/status.c
index e092e38..ac125f6 100644
--- a/src/status.c
+++ b/src/status.c
@@ -318,9 +318,9 @@ void content_status_interactions(FCGX_Request* req,
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (accts)
-        XPUSHs(newRV_noinc((SV*)perlify_accounts(accts, accts_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_accounts(accts, accts_len)));
     else ARG_UNDEFINED();
-    XPUSHs(newSVpv(label, 0));
+    mXPUSHs(newSVpv(label, 0));
 
     PERL_STACK_SCALAR_CALL("account::status_interactions");
 
@@ -367,20 +367,20 @@ void content_status(PATH_ARGS, uint8_t flags)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    XPUSHs(newRV_noinc((SV*)perlify_status(&status)));
+    mXPUSHs(newRV_noinc((SV*)perlify_status(&status)));
     if (statuses_before)
-        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_before, stat_before_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_before, stat_before_len)));
     else
         ARG_UNDEFINED();
     
     if (statuses_after)
-        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_after, stat_after_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_statuses(statuses_after, stat_after_len)));
     else
         ARG_UNDEFINED();
 
     if (picker)
     {
-        XPUSHs(newSVpv(picker, picker_len));
+        mXPUSHs(newSVpv(picker, picker_len));
     } else ARG_UNDEFINED();
 
     PERL_STACK_SCALAR_CALL("status::content_status");
diff --git a/src/timeline.c b/src/timeline.c
index 3802db4..ab4293b 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -47,11 +47,11 @@ void content_timeline(REQUEST_T req,
     XPUSHs(newRV_noinc((SV*)template_files));
     
     if (statuses)
-        XPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));
     else ARG_UNDEFINED();
 
     if (header_text)
-        XPUSHs(newSVpv(header_text, 0));
+        mXPUSHs(newSVpv(header_text, 0));
     else ARG_UNDEFINED();
 
     mXPUSHi(show_post_box);

From d68d55375931e8c693e1ffeb3b4daa8ad5d79ad3 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 25 Aug 2022 00:10:26 +0000
Subject: [PATCH 128/143] Cleanup chats, cleanup more perl stuff

FossilOrigin-Name: 01a373542dd5377a14612fe998a346a7356a5197afbe07eed96ffbb1e53ae4d2
---
 src/conversations.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/conversations.c b/src/conversations.c
index 2dd686e..9f468ec 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -70,7 +70,7 @@ void content_chats(PATH_ARGS)
 
     // Cleanup
     mastodont_storage_cleanup(&storage);
-    // TOOD cleanup chats
+    mstdnt_cleanup_chats(chats, chats_len);
     Safefree(dup);
 }
 
@@ -102,10 +102,10 @@ void content_chat_view(PATH_ARGS)
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
     if (chat_code == 0)
-        XPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
+        mXPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
     else ARG_UNDEFINED();
     if (messages)
-        XPUSHs(newRV_noinc((SV*)perlify_messages(messages, messages_len)));
+        mXPUSHs(newRV_noinc((SV*)perlify_messages(messages, messages_len)));
     else ARG_UNDEFINED();
     
     PERL_STACK_SCALAR_CALL("chat::construct_chat");
@@ -125,6 +125,8 @@ void content_chat_view(PATH_ARGS)
 
     mastodont_storage_cleanup(&storage);
     mastodont_storage_cleanup(&storage_chat);
+    mstdnt_cleanup_chats(chats);
+    mstdnt_cleanup_messages(messages);
     Safefree(dup);
 }
 

From 7390326d2c212308e4dd5ee7759f70364b66e82f Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 25 Aug 2022 00:14:22 +0000
Subject: [PATCH 129/143] Cleanup chats correctly

FossilOrigin-Name: 926e998d4538ddd0d601865073069728207a59a5cf69300c158be38e101c201f
---
 src/conversations.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/conversations.c b/src/conversations.c
index 9f468ec..f585c66 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -70,7 +70,7 @@ void content_chats(PATH_ARGS)
 
     // Cleanup
     mastodont_storage_cleanup(&storage);
-    mstdnt_cleanup_chats(chats, chats_len);
+    mstdnt_cleanup_chats(chats);
     Safefree(dup);
 }
 
@@ -125,7 +125,6 @@ void content_chat_view(PATH_ARGS)
 
     mastodont_storage_cleanup(&storage);
     mastodont_storage_cleanup(&storage_chat);
-    mstdnt_cleanup_chats(chats);
     mstdnt_cleanup_messages(messages);
     Safefree(dup);
 }

From f5d4a08d3bb74cef10adbf6d435fb5b2d364a2dd Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 25 Aug 2022 01:01:15 +0000
Subject: [PATCH 130/143] Macro for perlifying arrays, fix perl runtime leak

FossilOrigin-Name: 59639b62f7ebed10373fe3aa5ac234a500c14dbf428996395eee43738f156936
---
 src/account.c        | 14 +-------------
 src/attachments.c    | 16 ++--------------
 src/attachments.h    |  4 ++--
 src/conversations.c  | 32 ++++----------------------------
 src/emoji.c          | 15 ++-------------
 src/emoji.h          |  4 ++--
 src/emoji_reaction.c | 15 ++-------------
 src/emoji_reaction.h |  4 ++--
 src/global_perl.h    | 11 +++++++++++
 src/lists.c          | 13 +------------
 src/notifications.c  | 17 ++---------------
 src/notifications.h  |  4 ++--
 src/scrobble.c       | 17 ++---------------
 src/scrobble.h       |  4 ++--
 src/status.c         | 15 +--------------
 15 files changed, 38 insertions(+), 147 deletions(-)

diff --git a/src/account.c b/src/account.c
index 631e21b..578e12e 100644
--- a/src/account.c
+++ b/src/account.c
@@ -489,19 +489,7 @@ void content_account_favourites(PATH_ARGS)
     content_timeline(req, ssn, api, &storage, statuses, statuses_len, BASE_CAT_BOOKMARKS, "Favorites", 0, 1);
 }
 
-AV* perlify_accounts(const struct mstdnt_account* accounts, size_t len)
-{
-    if (!(accounts && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_account(accounts + i)));
-    }
-
-    return av;
-}
+PERLIFY_MULTI(account, accounts, mstdnt_account)
 
 HV* perlify_account(const struct mstdnt_account* acct)
 {
diff --git a/src/attachments.c b/src/attachments.c
index a623e43..233e937 100644
--- a/src/attachments.c
+++ b/src/attachments.c
@@ -116,7 +116,7 @@ void cleanup_media_ids(struct session* ssn, char** media_ids)
     free(media_ids);
 }
 
-HV* perlify_attachment(struct mstdnt_attachment* const attachment)
+HV* perlify_attachment(const struct mstdnt_attachment* const attachment)
 {
     if (!attachment) return NULL;
     HV* attach_hv = newHV();
@@ -131,19 +131,7 @@ HV* perlify_attachment(struct mstdnt_attachment* const attachment)
     return attach_hv;
 }
 
-AV* perlify_attachments(struct mstdnt_attachment* const attachments, size_t len)
-{
-    if (!(attachments && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_attachment(attachments + i)));
-    }
-
-    return av;
-}
+PERLIFY_MULTI(attachment, attachments, mstdnt_attachment)
 
 void api_attachment_create(PATH_ARGS)
 {
diff --git a/src/attachments.h b/src/attachments.h
index e576a5c..131b3da 100644
--- a/src/attachments.h
+++ b/src/attachments.h
@@ -37,7 +37,7 @@ void cleanup_media_ids(struct session* ssn, char** media_ids);
 void api_attachment_create(PATH_ARGS);
 
 // Perl
-HV* perlify_attachment(struct mstdnt_attachment* const attachment);
-AV* perlify_attachments(struct mstdnt_attachment* const attachments, size_t len);
+HV* perlify_attachment(const struct mstdnt_attachment* const attachment);
+AV* perlify_attachments(const struct mstdnt_attachment* const attachments, size_t len);
 
 #endif // ATTACHMENTS_H
diff --git a/src/conversations.c b/src/conversations.c
index f585c66..24f6ed8 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -70,7 +70,7 @@ void content_chats(PATH_ARGS)
 
     // Cleanup
     mastodont_storage_cleanup(&storage);
-    mstdnt_cleanup_chats(chats);
+    mstdnt_cleanup_chats(chats, chats_len);
     Safefree(dup);
 }
 
@@ -125,6 +125,7 @@ void content_chat_view(PATH_ARGS)
 
     mastodont_storage_cleanup(&storage);
     mastodont_storage_cleanup(&storage_chat);
+    mstdnt_cleanup_chat(&chat);
     mstdnt_cleanup_messages(messages);
     Safefree(dup);
 }
@@ -141,19 +142,7 @@ HV* perlify_chat(const struct mstdnt_chat* chat)
     return chat_hv;
 }
 
-AV* perlify_chats(const struct mstdnt_chat* chats, size_t len)
-{
-    if (!(chats && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_chat(chats + i)));
-    }
-
-    return av;
-}
+PERLIFY_MULTI(chat, chats, mstdnt_chat)
 
 HV* perlify_message(const struct mstdnt_message* message)
 {
@@ -171,17 +160,4 @@ HV* perlify_message(const struct mstdnt_message* message)
     return message_hv;
 }
 
-AV* perlify_messages(const struct mstdnt_message* messages, size_t len)
-{
-    if (!(messages && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_message(messages + i)));
-    }
-
-    return av;
-}
-
+PERLIFY_MULTI(message, messages, mstdnt_message)
diff --git a/src/emoji.c b/src/emoji.c
index 3a7025a..2cfe1b8 100644
--- a/src/emoji.c
+++ b/src/emoji.c
@@ -123,7 +123,7 @@ char* construct_emoji_picker(char* status_id, size_t* size)
     return dup;
 }
 
-HV* perlify_emoji(struct mstdnt_emoji* const emoji)
+HV* perlify_emoji(const struct mstdnt_emoji* const emoji)
 {
     if (!emoji) return NULL;
     HV* emoji_hv = newHV();
@@ -135,16 +135,5 @@ HV* perlify_emoji(struct mstdnt_emoji* const emoji)
     return emoji_hv;
 }
 
-AV* perlify_emojis(struct mstdnt_emoji* const emos, size_t len)
-{
-    if (!(emos && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
+PERLIFY_MULTI(emoji, emojis, mstdnt_emoji)
 
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_emoji(emos + i)));
-    }
-
-    return av;
-}
diff --git a/src/emoji.h b/src/emoji.h
index 44017c5..9d9e8cf 100644
--- a/src/emoji.h
+++ b/src/emoji.h
@@ -38,7 +38,7 @@ void content_emoji_picker(PATH_ARGS);
 char* construct_emoji_picker(char* status_id, size_t* size);
 
 // Perl
-HV* perlify_emoji(struct mstdnt_emoji* const emoji);
-AV* perlify_emojis(struct mstdnt_emoji* const emos, size_t len);
+HV* perlify_emoji(const struct mstdnt_emoji* const emoji);
+AV* perlify_emojis(const struct mstdnt_emoji* const emos, size_t len);
 
 #endif // EMOJI_H
diff --git a/src/emoji_reaction.c b/src/emoji_reaction.c
index d73aecd..6479759 100644
--- a/src/emoji_reaction.c
+++ b/src/emoji_reaction.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include "easprintf.h"
 
-HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji)
+HV* perlify_emoji_reaction(const struct mstdnt_emoji_reaction* const emoji)
 {
     if (!emoji) return NULL;
     HV* emoji_hv = newHV();
@@ -34,16 +34,5 @@ HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji)
     return emoji_hv;
 }
 
-AV* perlify_emoji_reactions(struct mstdnt_emoji_reaction* const emos, size_t len)
-{
-    if (!(emos && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
+PERLIFY_MULTI(emoji_reaction, emoji_reactions, mstdnt_emoji_reaction)
 
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_emoji_reaction(emos + i)));
-    }
-
-    return av;
-}
diff --git a/src/emoji_reaction.h b/src/emoji_reaction.h
index bacaa14..22dea36 100644
--- a/src/emoji_reaction.h
+++ b/src/emoji_reaction.h
@@ -22,7 +22,7 @@
 #include "global_perl.h"
 
 // Perl
-HV* perlify_emoji_reaction(struct mstdnt_emoji_reaction* const emoji);
-AV* perlify_emoji_reactions(struct mstdnt_emoji_reaction* const emos, size_t len);
+HV* perlify_emoji_reaction(const struct mstdnt_emoji_reaction* const emoji);
+AV* perlify_emoji_reactions(const struct mstdnt_emoji_reaction* const emos, size_t len);
 
 #endif // EMOJI_REACTION_H
diff --git a/src/global_perl.h b/src/global_perl.h
index 74e3bb9..38c31ab 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -46,6 +46,17 @@
     LEAVE;                                          \
     perl_unlock()
 
+#define PERLIFY_MULTI(type, types, mstype) AV* perlify_##types(const struct mstype* const types, size_t len) { \
+        if (!(types && len)) return NULL;                               \
+        AV* av = newAV();                                               \
+        av_extend(av, len-1);                                           \
+        for (size_t i = 0; i < len; ++i)                                \
+            av_store(av, i, newRV_noinc((SV*)perlify_##type(types + i))); \
+        return av;                                                      \
+    }
+    
+
+
 extern PerlInterpreter* my_perl;
 extern HV* template_files;
 extern pthread_mutex_t perllock_mutex;
diff --git a/src/lists.c b/src/lists.c
index 93108cf..a49a92b 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -115,16 +115,5 @@ HV* perlify_list(const struct mstdnt_list* list)
     return list_hv;
 }
 
-AV* perlify_lists(const struct mstdnt_list* lists, size_t len)
-{
-    if (!(lists && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
+PERLIFY_MULTI(list, lists, mstdnt_list)
 
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_list(lists + i)));
-    }
-
-    return av;
-}
diff --git a/src/notifications.c b/src/notifications.c
index 9eeecc7..1f15b36 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -181,7 +181,7 @@ static HV* perlify_notification_pleroma(struct mstdnt_notification_pleroma* noti
 
 
 // Converts it into a perl struct
-HV* perlify_notification(struct mstdnt_notification* notif)
+HV* perlify_notification(const struct mstdnt_notification* const notif)
 {
     if (!notif) return NULL;
     HV* notif_hv = newHV();
@@ -197,20 +197,7 @@ HV* perlify_notification(struct mstdnt_notification* notif)
     return notif_hv;
 }
 
-// The same as above, but for multiple
-AV* perlify_notifications(struct mstdnt_notification* notifs, size_t len)
-{
-    if (!(notifs && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_notification(notifs + i)));
-    }
-
-    return av;
-}
+PERLIFY_MULTI(notification, notifications, mstdnt_notification)
 
 void api_notifications(PATH_ARGS)
 {
diff --git a/src/notifications.h b/src/notifications.h
index 1fa623f..50b4339 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -32,7 +32,7 @@ void content_notifications_read(PATH_ARGS);
 
 void api_notifications(PATH_ARGS);
 
-HV* perlify_notification(struct mstdnt_notification* notif);
-AV* perlify_notifications(struct mstdnt_notification* notif, size_t len);
+HV* perlify_notification(const struct mstdnt_notification* const notif);
+AV* perlify_notifications(const struct mstdnt_notification* const notif, size_t len);
 
 #endif // NOTIFICATION_H
diff --git a/src/scrobble.c b/src/scrobble.c
index c6a2040..521c147 100644
--- a/src/scrobble.c
+++ b/src/scrobble.c
@@ -22,7 +22,7 @@
 #include "account.h"
 
 // Converts it into a perl struct
-HV* perlify_scrobble(struct mstdnt_scrobble* scrobble)
+HV* perlify_scrobble(const struct mstdnt_scrobble* const scrobble)
 {
     if (!scrobble) return NULL;
     HV* scrobble_hv = newHV();
@@ -38,17 +38,4 @@ HV* perlify_scrobble(struct mstdnt_scrobble* scrobble)
     return scrobble_hv;
 }
 
-// The same as above, but for multiple
-AV* perlify_scrobbles(struct mstdnt_scrobble* scrobble, size_t len)
-{
-    if (!(scrobble && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_scrobble(scrobble + i)));
-    }
-
-    return av;
-}
+PERLIFY_MULTI(scrobble, scrobbles, mstdnt_scrobble)
diff --git a/src/scrobble.h b/src/scrobble.h
index ef20e9b..e2174e5 100644
--- a/src/scrobble.h
+++ b/src/scrobble.h
@@ -21,7 +21,7 @@
 #include <mastodont.h>
 #include "global_perl.h"
 
-HV* perlify_scrobble(struct mstdnt_scrobble* scrobble);
-AV* perlify_scrobbles(struct mstdnt_scrobble* scrobble, size_t len);
+HV* perlify_scrobble(const struct mstdnt_scrobble* const scrobble);
+AV* perlify_scrobbles(const struct mstdnt_scrobble* const scrobble, size_t len);
 
 #endif /* SCROBBLE_H */
diff --git a/src/status.c b/src/status.c
index ac125f6..f9ff323 100644
--- a/src/status.c
+++ b/src/status.c
@@ -470,17 +470,4 @@ HV* perlify_status(const struct mstdnt_status* status)
     return status_hv;
 }
 
-
-AV* perlify_statuses(const struct mstdnt_status* statuses, size_t len)
-{
-    if (!(statuses && len)) return NULL;
-    AV* av = newAV();
-    av_extend(av, len-1);
-
-    for (int i = 0; i < len; ++i)
-    {
-        av_store(av, i, newRV_inc((SV*)perlify_status(statuses + i)));
-    }
-
-    return av;
-}
+PERLIFY_MULTI(status, statuses, mstdnt_status)

From 0617cdbd878d948203c168e717067034a380a483 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 25 Aug 2022 01:29:09 +0000
Subject: [PATCH 131/143] Fix notifications memleak

FossilOrigin-Name: d7c1cffde3338a7ef54bdf3355735807e0dab93414c0936ebfc7f92d2861ec86
---
 src/notifications.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/notifications.c b/src/notifications.c
index 1f15b36..5be1fe4 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -79,6 +79,7 @@ void content_notifications(PATH_ARGS)
     // Output
     render_base_page(&b, req, ssn, api);
     mastodont_storage_cleanup(&storage);
+    mstdnt_cleanup_notifications(notifs, notifs_len);
     Safefree(dup);
 }
 

From f1ef5c6fa0237393263e27730f3c1c996fc02600 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 25 Aug 2022 17:10:37 +0000
Subject: [PATCH 132/143] Switch to 1 destruct level

FossilOrigin-Name: 5a8202cbb4c52a74b5467c82b721e15b9c8e109d7e954dc659300fc01c684ff4
---
 src/base_page.c | 2 +-
 src/main.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/base_page.c b/src/base_page.c
index 4ef0ed9..379285a 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -87,7 +87,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     char* dup = PERL_GET_STACK_EXIT;
     
     send_result(req, NULL, "text/html", dup, 0);
-    
+
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
     Safefree(dup);
diff --git a/src/main.c b/src/main.c
index 6df0d1a..fdc1f90 100644
--- a/src/main.c
+++ b/src/main.c
@@ -247,7 +247,7 @@ int main(int argc, char **argv, char **env)
 
     perl_parse(my_perl, xs_init, (sizeof(perl_argv) / sizeof(perl_argv[0])) - 1, perl_argv, (char**)NULL);
     PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-    PL_perl_destruct_level = 2;
+    PL_perl_destruct_level = 1;
     perl_run(my_perl);
 
     init_template_files(aTHX);

From e12be1a84bb56082e862cc8de9f97b414954159e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 26 Aug 2022 01:49:35 +0000
Subject: [PATCH 133/143] Fix memleak

FossilOrigin-Name: 1d0d189731ac60247707eb08f7bbc422c945916626638e052340c31a23ab4130
---
 src/base_page.c     | 2 +-
 src/notifications.c | 4 ++--
 src/page_config.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/base_page.c b/src/base_page.c
index 379285a..c6039fa 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -73,7 +73,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
         mXPUSHs(newRV_noinc((SV*)page->session));
     else
         mXPUSHs(newRV_noinc((SV*)perlify_session(ssn)));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    mXPUSHs(newRV_inc((SV*)template_files));
     mXPUSHs(newSVpv(page->content, 0));
 
     if (notifs && notifs_len)
diff --git a/src/notifications.c b/src/notifications.c
index 5be1fe4..2cf923f 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -59,7 +59,7 @@ void content_notifications(PATH_ARGS)
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    mXPUSHs(newRV_inc((SV*)template_files));
     if (notifs)
         mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     
@@ -113,7 +113,7 @@ void content_notifications_compact(PATH_ARGS)
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     mXPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    mXPUSHs(newRV_inc((SV*)template_files));
     if (notifs)
         mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
 
diff --git a/src/page_config.c b/src/page_config.c
index 6e35af7..1481bb6 100644
--- a/src/page_config.c
+++ b/src/page_config.c
@@ -45,7 +45,7 @@ void content_config_general(PATH_ARGS)
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    mXPUSHs(newRV_inc((SV*)template_files));
     
     PERL_STACK_SCALAR_CALL("config::general");
     

From 6e6ca8ad9a37ca5de6f80849e55d733d8d389d9e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 26 Aug 2022 18:20:54 +0000
Subject: [PATCH 134/143] Fiddling...

FossilOrigin-Name: 7ac1a6ecafbc849e0510aeccf025ea07d7853f64eb89e87dc19046c8efa36a8c
---
 src/base_page.c   | 1 +
 src/global_perl.h | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/base_page.c b/src/base_page.c
index c6039fa..9bb501d 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -81,6 +81,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
         mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
     }
     else ARG_UNDEFINED();
+
     
     // Run function
     PERL_STACK_SCALAR_CALL("base_page");
diff --git a/src/global_perl.h b/src/global_perl.h
index 38c31ab..6c544c6 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -23,10 +23,9 @@
 #include <pthread.h>
 
 //    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
-#define hvstores_str(hv, key, val) hv_stores((hv), key, ((val) ? newSVpv((val), 0) : &PL_sv_undef))
+#define hvstores_str(hv, key, val) if (val) { hv_stores((hv), key, newSVpv((val), 0)); }
 #define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
-#define hvstores_ref(hv, key, val) hv_stores((hv), key,                 \
-                                             ((val) ? newRV_noinc((SV* const)(val)) : &PL_sv_undef))
+#define hvstores_ref(hv, key, val) if (val) {  hv_stores((hv), key, newRV_noinc((SV*)(val))); }
 
 /* Seeing all this shit littered in Treebird's code made me decide to write some macros */
 #define PERL_STACK_INIT perl_lock(); \
@@ -49,9 +48,8 @@
 #define PERLIFY_MULTI(type, types, mstype) AV* perlify_##types(const struct mstype* const types, size_t len) { \
         if (!(types && len)) return NULL;                               \
         AV* av = newAV();                                               \
-        av_extend(av, len-1);                                           \
         for (size_t i = 0; i < len; ++i)                                \
-            av_store(av, i, newRV_noinc((SV*)perlify_##type(types + i))); \
+            av_push(av, newRV_noinc((SV*)perlify_##type(types + i))); \
         return av;                                                      \
     }
     

From a8ac0d3b4c27e222a8618d542981208a76dacf1f Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 12 Oct 2022 15:11:45 +0000
Subject: [PATCH 135/143] Memory optimizations (in progress)

FossilOrigin-Name: 22237b8da97b3a0053609d84c43b07ac2929beb913f66d8677750eec6b4343cc
---
 src/base_page.c     | 26 +++++++++++++++++++-------
 src/global_perl.h   | 12 ++++++------
 src/notifications.c |  8 ++++----
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/base_page.c b/src/base_page.c
index 9bb501d..9af03e2 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -69,19 +69,30 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
 
     PERL_STACK_INIT;
 
-    if (page->session)
-        mXPUSHs(newRV_noinc((SV*)page->session));
-    else
-        mXPUSHs(newRV_noinc((SV*)perlify_session(ssn)));
-    mXPUSHs(newRV_inc((SV*)template_files));
-    mXPUSHs(newSVpv(page->content, 0));
+    AV* pl_notifs = perlify_notifications(notifs, notifs_len);
+    SV* pl_notifs_rv = newRV_noinc(pl_notifs);
+    SV* real_ssn = page->session ? page->session : perlify_session(ssn);
+    XPUSHs(sv_2mortal(newRV_noinc((SV*)real_ssn)));
+
+    XPUSHs(sv_2mortal(newRV_inc((SV*)template_files)));
+    SV* content = newSVpv(page->content, 0);
+    XPUSHs(sv_2mortal(content));
 
     if (notifs && notifs_len)
     {
-        mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
+        XPUSHs(sv_2mortal(pl_notifs_rv));
     }
     else ARG_UNDEFINED();
 
+    SvREFCNT_dec(pl_notifs_rv);
+    SvREFCNT_dec(pl_notifs);
+    SvREFCNT_dec(content);
+    SvREFCNT_dec(real_ssn);
+
+    av_undef(pl_notifs);
+    sv_set_undef(pl_notifs_rv);
+    sv_set_undef(real_ssn);
+    sv_set_undef(content);
     
     // Run function
     PERL_STACK_SCALAR_CALL("base_page");
@@ -89,6 +100,7 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     
     send_result(req, NULL, "text/html", dup, 0);
 
+    free(page->content);
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
     Safefree(dup);
diff --git a/src/global_perl.h b/src/global_perl.h
index 6c544c6..d30fe98 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -23,9 +23,9 @@
 #include <pthread.h>
 
 //    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
-#define hvstores_str(hv, key, val) if (val) { hv_stores((hv), key, newSVpv((val), 0)); }
-#define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
-#define hvstores_ref(hv, key, val) if (val) {  hv_stores((hv), key, newRV_noinc((SV*)(val))); }
+#define hvstores_str(hv, key, val) if (val) { hv_stores((hv), key, sv_2mortal(newSVpv((val), 0))); }
+#define hvstores_int(hv, key, val) hv_stores((hv), key, sv_2mortal(newSViv((val))))
+#define hvstores_ref(hv, key, val) if (val) {  hv_stores((hv), key, sv_2mortal(newRV_noinc((SV*)(val)))); }
 
 /* Seeing all this shit littered in Treebird's code made me decide to write some macros */
 #define PERL_STACK_INIT perl_lock(); \
@@ -39,7 +39,7 @@
     SPAGAIN
 
 /* you MUST assign scalar from savesharedsvpv, then free when done */
-#define PERL_GET_STACK_EXIT savesharedsvpv(POPs);   \
+#define PERL_GET_STACK_EXIT savesvpv(POPs);   \
     PUTBACK;                                        \
     FREETMPS;                                       \
     LEAVE;                                          \
@@ -49,8 +49,8 @@
         if (!(types && len)) return NULL;                               \
         AV* av = newAV();                                               \
         for (size_t i = 0; i < len; ++i)                                \
-            av_push(av, newRV_noinc((SV*)perlify_##type(types + i))); \
-        return av;                                                      \
+            av_push(av, sv_2mortal(newRV_noinc((SV*)sv_2mortal(perlify_##type(types + i))))); \
+        return sv_2mortal(av);                                        \
     }
     
 
diff --git a/src/notifications.c b/src/notifications.c
index 2cf923f..42f685b 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -191,11 +191,11 @@ HV* perlify_notification(const struct mstdnt_notification* const notif)
     hvstores_int(notif_hv, "created_at", notif->created_at);
     hvstores_str(notif_hv, "emoji", notif->emoji);
     hvstores_str(notif_hv, "type", mstdnt_notification_t_to_str(notif->type));
-    hvstores_ref(notif_hv, "account", perlify_account(notif->account));
-    hvstores_ref(notif_hv, "pleroma", perlify_notification_pleroma(notif->pleroma));
-    hvstores_ref(notif_hv, "status", perlify_status(notif->status));
+    hvstores_ref(notif_hv, "account", sv_2mortal(perlify_account(notif->account)));
+    hvstores_ref(notif_hv, "pleroma", sv_2mortal(perlify_notification_pleroma(notif->pleroma)));
+hvstores_ref(notif_hv, "status", sv_2mortal(perlify_status(notif->status)));
     
-    return notif_hv;
+    return (HV*)sv_2mortal((SV*)notif_hv);
 }
 
 PERLIFY_MULTI(notification, notifications, mstdnt_notification)

From 682f6e0813c297fc221be5dcb190df69606eec4b Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 12 Oct 2022 19:30:55 +0000
Subject: [PATCH 136/143] Undef in main

FossilOrigin-Name: bad68ecf59eb93817413d54d47c7ca5a5bdb6b36dba0c9163dc7299b26c31f7a
---
 Makefile            |  4 ++--
 perl/main.pl        |  7 +++++--
 src/about.c         |  6 +++---
 src/base_page.c     | 19 +++++++------------
 src/global_perl.h   | 10 +++++-----
 src/notifications.c |  8 ++++----
 6 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index bee0cf0..df99da1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ CC ?= cc
 GIT ?= git
 MASTODONT_DIR = mastodont-c/
 MASTODONT = $(MASTODONT_DIR)libmastodont.a
-CFLAGS += -Wall -I $(MASTODONT_DIR)include/ -Wno-unused-variable -Wno-ignored-qualifiers -I/usr/include/ -I $(MASTODONT_DIR)/libs $(shell pkg-config --cflags libcurl libpcre2-8) `perl -MExtUtils::Embed -e ccopts`
-LDFLAGS += -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpcre2-8) -lfcgi -lpthread `perl -MExtUtils::Embed -e ldopts`
+CFLAGS += -Wall -I $(MASTODONT_DIR)include/ -Wno-unused-variable -Wno-ignored-qualifiers -I/usr/include/ -I $(MASTODONT_DIR)/libs $(shell pkg-config --cflags libcurl libpcre2-8) `perl -MExtUtils::Embed -e ccopts` -DDEBUGGING_MSTATS
+LDFLAGS += -L$(MASTODONT_DIR) -lmastodont $(shell pkg-config --libs libcurl libpcre2-8) -lfcgi -lpthread `perl -MExtUtils::Embed -e ldopts` -DDEBUGGING_MSTATS
 SRC = $(wildcard src/*.c)
 OBJ = $(patsubst %.c,%.o,$(SRC))
 HEADERS = $(wildcard src/*.h) config.h
diff --git a/perl/main.pl b/perl/main.pl
index 66a3468..db7e643 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -47,6 +47,9 @@ sub base_page
         notification => \&generate_notification,
         );
 
-    to_template(\%vars, \$data->{'main.tt'});
+    my $ret = to_template(\%vars, \$data->{'main.tt'});
+    undef($notifs);
+    undef($main);
+    undef($ssn);
+    return $ret;
 }
-
diff --git a/src/about.c b/src/about.c
index 79228c8..e522f2c 100644
--- a/src/about.c
+++ b/src/about.c
@@ -25,10 +25,9 @@ void content_about(PATH_ARGS)
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    XPUSHs(newRV_inc((SV*)template_files));
 
     PERL_STACK_SCALAR_CALL("meta::about");
-
     char* dup = PERL_GET_STACK_EXIT;
     
     struct base_page b = {
@@ -39,7 +38,8 @@ void content_about(PATH_ARGS)
     };
 
     render_base_page(&b, req, ssn, api);
-    Safefree(dup);
+    free(dup);
+//    sv_free(session_hv);
 }
 
 
diff --git a/src/base_page.c b/src/base_page.c
index 9af03e2..494493b 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -84,26 +84,21 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
     }
     else ARG_UNDEFINED();
 
-    SvREFCNT_dec(pl_notifs_rv);
-    SvREFCNT_dec(pl_notifs);
-    SvREFCNT_dec(content);
-    SvREFCNT_dec(real_ssn);
-
-    av_undef(pl_notifs);
-    sv_set_undef(pl_notifs_rv);
-    sv_set_undef(real_ssn);
-    sv_set_undef(content);
-    
     // Run function
     PERL_STACK_SCALAR_CALL("base_page");
     char* dup = PERL_GET_STACK_EXIT;
     
     send_result(req, NULL, "text/html", dup, 0);
 
-    free(page->content);
+     /* av_clear(pl_notifs); */
+     /* av_undef(pl_notifs); */
+     /* sv_free(pl_notifs_rv); */
+     //hv_undef(real_ssn);
+     //sv_free(content);
+    
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
-    Safefree(dup);
+    free(dup);
 }
 
 void send_result(FCGX_Request* req, char* status, char* content_type, char* data, size_t data_len)
diff --git a/src/global_perl.h b/src/global_perl.h
index d30fe98..7c23ad6 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -23,9 +23,9 @@
 #include <pthread.h>
 
 //    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
-#define hvstores_str(hv, key, val) if (val) { hv_stores((hv), key, sv_2mortal(newSVpv((val), 0))); }
-#define hvstores_int(hv, key, val) hv_stores((hv), key, sv_2mortal(newSViv((val))))
-#define hvstores_ref(hv, key, val) if (val) {  hv_stores((hv), key, sv_2mortal(newRV_noinc((SV*)(val)))); }
+#define hvstores_str(hv, key, val) if (val) { hv_stores((hv), key, Perl_newSVpv_share(aTHX_ (val), 0)); }
+#define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
+#define hvstores_ref(hv, key, val) if (val) {  hv_stores((hv), key, newRV_noinc((SV*)(val))); }
 
 /* Seeing all this shit littered in Treebird's code made me decide to write some macros */
 #define PERL_STACK_INIT perl_lock(); \
@@ -49,8 +49,8 @@
         if (!(types && len)) return NULL;                               \
         AV* av = newAV();                                               \
         for (size_t i = 0; i < len; ++i)                                \
-            av_push(av, sv_2mortal(newRV_noinc((SV*)sv_2mortal(perlify_##type(types + i))))); \
-        return sv_2mortal(av);                                        \
+            av_push(av, newRV_noinc((SV*)perlify_##type(types + i))); \
+        return av;                                                      \
     }
     
 
diff --git a/src/notifications.c b/src/notifications.c
index 42f685b..2cf923f 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -191,11 +191,11 @@ HV* perlify_notification(const struct mstdnt_notification* const notif)
     hvstores_int(notif_hv, "created_at", notif->created_at);
     hvstores_str(notif_hv, "emoji", notif->emoji);
     hvstores_str(notif_hv, "type", mstdnt_notification_t_to_str(notif->type));
-    hvstores_ref(notif_hv, "account", sv_2mortal(perlify_account(notif->account)));
-    hvstores_ref(notif_hv, "pleroma", sv_2mortal(perlify_notification_pleroma(notif->pleroma)));
-hvstores_ref(notif_hv, "status", sv_2mortal(perlify_status(notif->status)));
+    hvstores_ref(notif_hv, "account", perlify_account(notif->account));
+    hvstores_ref(notif_hv, "pleroma", perlify_notification_pleroma(notif->pleroma));
+    hvstores_ref(notif_hv, "status", perlify_status(notif->status));
     
-    return (HV*)sv_2mortal((SV*)notif_hv);
+    return notif_hv;
 }
 
 PERLIFY_MULTI(notification, notifications, mstdnt_notification)

From 61b4c20f2ee9462d63306ccd8b36b09f9e39367e Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 13 Oct 2022 02:35:35 +0000
Subject: [PATCH 137/143] FINALLY fixed the memleak root cause, for good

FossilOrigin-Name: c7f650b4f4efaf66ad769919f2277c46345b79337058a13db732c0d8770e625c
---
 perl/icons.pm          |  2 ++
 perl/main.pl           | 23 ++++++++------
 perl/string_helpers.pm |  2 ++
 src/about.c            |  7 ++--
 src/base_page.c        | 23 ++++----------
 src/global_perl.h      | 14 +++++---
 src/notifications.c    |  2 +-
 src/query.c            | 72 +++++++++++++++++++++---------------------
 src/timeline.c         |  4 +--
 9 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/perl/icons.pm b/perl/icons.pm
index c0cfd39..7243d4f 100644
--- a/perl/icons.pm
+++ b/perl/icons.pm
@@ -1,6 +1,7 @@
 package icons;
 use strict;
 use warnings;
+use Scalar::Util 'looks_like_number';
 
 use Exporter 'import';
 
@@ -57,6 +58,7 @@ sub visibility_to_icon
 {
     # I thought of an array, but I don't want to call get_icon UNLESS
     # we know the visibility
+    return unless looks_like_number($_[0]);
     my $vis = $_[0];
 
     return get_icon('public') if $vis == 1;
diff --git a/perl/main.pl b/perl/main.pl
index db7e643..274cb8f 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -16,14 +16,10 @@ use config;
 use embed;
 use meta;
 use login;
+# use Devel::Leak;
 
-# my $template = Template->new(
-#     {
-#         INTERPOLATE => 1,
-#         POST_CHOMP => 1,
-#         EVAL_PERL => 1,
-#         TRIM => 1
-#     });
+# my $handle;
+# Devel::Leak::NoteSV($handle);
 
 sub base_page
 {
@@ -48,8 +44,15 @@ sub base_page
         );
 
     my $ret = to_template(\%vars, \$data->{'main.tt'});
-    undef($notifs);
-    undef($main);
-    undef($ssn);
+
+#    leaky_friend();
+
     return $ret;
 }
+
+# sub leaky_friend
+# {
+#     $count = Devel::Leak::CheckSV($handle);
+#     my $leakstr = "Memory: $count SVs\n";
+#     print STDERR $leakstr;
+# }
diff --git a/perl/string_helpers.pm b/perl/string_helpers.pm
index 09fdf4b..20e7bb1 100644
--- a/perl/string_helpers.pm
+++ b/perl/string_helpers.pm
@@ -2,6 +2,7 @@ package string_helpers;
 use strict;
 use warnings;
 use Exporter 'import';
+use Scalar::Util 'looks_like_number';
 
 our @EXPORT = qw( reltime_to_str greentextify emojify format_username get_mentions_from_content localize_mentions simple_escape random_error_kaomoji );
 
@@ -9,6 +10,7 @@ my $re_mentions = '(?=<a .*?mention.*?)<a .*?href="https?:\/\/(.*?)\/(?:@|users\
 
 sub reltime_to_str
 {
+    return unless looks_like_number($_[0]);
     my $since = time() - $_[0];
 
     return $since . 's' if $since < 60;
diff --git a/src/about.c b/src/about.c
index e522f2c..7ffba85 100644
--- a/src/about.c
+++ b/src/about.c
@@ -24,8 +24,8 @@ void content_about(PATH_ARGS)
 {
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_inc((SV*)template_files));
+    mXPUSHs(newRV_inc((SV*)session_hv));
+    mXPUSHs(newRV_inc((SV*)template_files));
 
     PERL_STACK_SCALAR_CALL("meta::about");
     char* dup = PERL_GET_STACK_EXIT;
@@ -38,8 +38,7 @@ void content_about(PATH_ARGS)
     };
 
     render_base_page(&b, req, ssn, api);
-    free(dup);
-//    sv_free(session_hv);
+    Safefree(dup);
 }
 
 
diff --git a/src/base_page.c b/src/base_page.c
index 494493b..341adf4 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -69,36 +69,27 @@ void render_base_page(struct base_page* page, FCGX_Request* req, struct session*
 
     PERL_STACK_INIT;
 
-    AV* pl_notifs = perlify_notifications(notifs, notifs_len);
-    SV* pl_notifs_rv = newRV_noinc(pl_notifs);
-    SV* real_ssn = page->session ? page->session : perlify_session(ssn);
-    XPUSHs(sv_2mortal(newRV_noinc((SV*)real_ssn)));
-
-    XPUSHs(sv_2mortal(newRV_inc((SV*)template_files)));
-    SV* content = newSVpv(page->content, 0);
-    XPUSHs(sv_2mortal(content));
+    HV* real_ssn = page->session ? page->session : perlify_session(ssn);
+    mXPUSHs(newRV_noinc((SV*)real_ssn));
+    mXPUSHs(newRV_inc((SV*)template_files));
+    mXPUSHs(newSVpv(page->content, 0));
 
     if (notifs && notifs_len)
     {
-        XPUSHs(sv_2mortal(pl_notifs_rv));
+        mXPUSHs(newRV_noinc(perlify_notifications(notifs, notifs_len)));
     }
     else ARG_UNDEFINED();
 
     // Run function
     PERL_STACK_SCALAR_CALL("base_page");
     char* dup = PERL_GET_STACK_EXIT;
+
     
     send_result(req, NULL, "text/html", dup, 0);
-
-     /* av_clear(pl_notifs); */
-     /* av_undef(pl_notifs); */
-     /* sv_free(pl_notifs_rv); */
-     //hv_undef(real_ssn);
-     //sv_free(content);
     
     mstdnt_cleanup_notifications(notifs, notifs_len);
     mastodont_storage_cleanup(&storage);
-    free(dup);
+    Safefree(dup);
 }
 
 void send_result(FCGX_Request* req, char* status, char* content_type, char* data, size_t data_len)
diff --git a/src/global_perl.h b/src/global_perl.h
index 7c23ad6..563d4ac 100644
--- a/src/global_perl.h
+++ b/src/global_perl.h
@@ -22,10 +22,15 @@
 #include <perl.h>
 #include <pthread.h>
 
-//    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0)); 
-#define hvstores_str(hv, key, val) if (val) { hv_stores((hv), key, Perl_newSVpv_share(aTHX_ (val), 0)); }
+//    hv_stores(ssn_hv, "id", newSVpv(acct->id, 0));
+// TODO use sv_usepvn_flags soon
+#define hvstores_str(hv, key, val) if ((val)) { hv_stores((hv), key, newSVpvn((val), strlen(val))); }
 #define hvstores_int(hv, key, val) hv_stores((hv), key, newSViv((val)))
-#define hvstores_ref(hv, key, val) if (val) {  hv_stores((hv), key, newRV_noinc((SV*)(val))); }
+#define hvstores_ref(hv, key, val) if (1) {     \
+        SV* tmp = (SV*)(val);                   \
+        if (tmp)                                \
+            hv_stores((hv), key, newRV_noinc(tmp)); \
+    }
 
 /* Seeing all this shit littered in Treebird's code made me decide to write some macros */
 #define PERL_STACK_INIT perl_lock(); \
@@ -48,8 +53,9 @@
 #define PERLIFY_MULTI(type, types, mstype) AV* perlify_##types(const struct mstype* const types, size_t len) { \
         if (!(types && len)) return NULL;                               \
         AV* av = newAV();                                               \
+        av_extend(av, len-1);                                           \
         for (size_t i = 0; i < len; ++i)                                \
-            av_push(av, newRV_noinc((SV*)perlify_##type(types + i))); \
+            av_store(av, i, newRV_noinc((SV*)perlify_##type(types + i))); \
         return av;                                                      \
     }
     
diff --git a/src/notifications.c b/src/notifications.c
index 2cf923f..fc62364 100644
--- a/src/notifications.c
+++ b/src/notifications.c
@@ -58,7 +58,7 @@ void content_notifications(PATH_ARGS)
 
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_noinc((SV*)session_hv));
+    mXPUSHs(newRV_inc((SV*)session_hv));
     mXPUSHs(newRV_inc((SV*)template_files));
     if (notifs)
         mXPUSHs(newRV_noinc((SV*)perlify_notifications(notifs, notifs_len)));
diff --git a/src/query.c b/src/query.c
index 3763536..8eb46e6 100644
--- a/src/query.c
+++ b/src/query.c
@@ -276,42 +276,42 @@ HV* perlify_post_values(struct post_values* post)
     HV* ssn_post_hv = newHV();
 
     // This ugly...
-    hv_stores(ssn_post_hv, "theme", newSVpv(keystr(post->theme), 0));
-    hv_stores(ssn_post_hv, "themeclr", newSViv(keyint(post->themeclr)));
-    hv_stores(ssn_post_hv, "lang", newSViv(keyint(post->lang)));
-    hv_stores(ssn_post_hv, "title", newSViv(keyint(post->title)));
-    hv_stores(ssn_post_hv, "jsactions", newSViv(keyint(post->jsactions)));
-    hv_stores(ssn_post_hv, "jsreply", newSViv(keyint(post->jsreply)));
-    hv_stores(ssn_post_hv, "jslive", newSViv(keyint(post->jslive)));
-    hv_stores(ssn_post_hv, "js", newSViv(keyint(post->js)));
-    hv_stores(ssn_post_hv, "interact_img", newSViv(keyint(post->interact_img)));
-    hv_stores(ssn_post_hv, "stat_attachments", newSViv(keyint(post->stat_attachments)));
-    hv_stores(ssn_post_hv, "stat_greentexts", newSViv(keyint(post->stat_greentexts)));
-    hv_stores(ssn_post_hv, "stat_dope", newSViv(keyint(post->stat_dope)));
-    hv_stores(ssn_post_hv, "stat_oneclicksoftware", newSViv(keyint(post->stat_oneclicksoftware)));
-    hv_stores(ssn_post_hv, "stat_emojo_likes", newSViv(keyint(post->stat_emojo_likes)));
-    hv_stores(ssn_post_hv, "stat_hide_muted", newSViv(keyint(post->stat_hide_muted)));
-    hv_stores(ssn_post_hv, "instance_show_shoutbox", newSViv(keyint(post->instance_show_shoutbox)));
-    hv_stores(ssn_post_hv, "instance_panel", newSViv(keyint(post->instance_panel)));
-    hv_stores(ssn_post_hv, "notif_embed", newSViv(keyint(post->notif_embed)));
-    hv_stores(ssn_post_hv, "set", newSViv(keyint(post->set)));
-    hv_stores(ssn_post_hv, "only_media", newSViv(keyint(post->only_media)));
-    hv_stores(ssn_post_hv, "replies_only", newSViv(keyint(post->replies_only)));
-    hv_stores(ssn_post_hv, "replies_policy", newSViv(keyint(post->replies_policy)));
-    hv_stores(ssn_post_hv, "emojoindex", newSViv(keyint(post->emojoindex)));
-    hv_stores(ssn_post_hv, "sidebar_opacity", newSViv(keyint(post->sidebar_opacity)));
-    hv_stores(ssn_post_hv, "file_ids", newSVpv(keystr(post->file_ids), 0));
-    hv_stores(ssn_post_hv, "content", newSVpv(keystr(post->content), 0));
-    hv_stores(ssn_post_hv, "itype", newSVpv(keystr(post->itype), 0));
-    hv_stores(ssn_post_hv, "id", newSVpv(keystr(post->id), 0));
-    hv_stores(ssn_post_hv, "username", newSVpv(keystr(post->username), 0));
-    hv_stores(ssn_post_hv, "password", newSVpv(keystr(post->password), 0));
-    hv_stores(ssn_post_hv, "replyid", newSVpv(keystr(post->replyid), 0));
-    hv_stores(ssn_post_hv, "visibility", newSVpv(keystr(post->visibility), 0));
-    hv_stores(ssn_post_hv, "instance", newSVpv(keystr(post->instance), 0));
-    hv_stores(ssn_post_hv, "min_id", newSVpv(keystr(post->min_id), 0));
-    hv_stores(ssn_post_hv, "max_id", newSVpv(keystr(post->max_id), 0));
-    hv_stores(ssn_post_hv, "start_id", newSVpv(keystr(post->start_id), 0));
+    /* hv_stores(ssn_post_hv, "theme", newSVpv(keystr(post->theme), 0)); */
+    /* hv_stores(ssn_post_hv, "themeclr", newSViv(keyint(post->themeclr))); */
+    /* hv_stores(ssn_post_hv, "lang", newSViv(keyint(post->lang))); */
+    /* hv_stores(ssn_post_hv, "title", newSViv(keyint(post->title))); */
+    /* hv_stores(ssn_post_hv, "jsactions", newSViv(keyint(post->jsactions))); */
+    /* hv_stores(ssn_post_hv, "jsreply", newSViv(keyint(post->jsreply))); */
+    /* hv_stores(ssn_post_hv, "jslive", newSViv(keyint(post->jslive))); */
+    /* hv_stores(ssn_post_hv, "js", newSViv(keyint(post->js))); */
+    /* hv_stores(ssn_post_hv, "interact_img", newSViv(keyint(post->interact_img))); */
+    /* hv_stores(ssn_post_hv, "stat_attachments", newSViv(keyint(post->stat_attachments))); */
+    /* hv_stores(ssn_post_hv, "stat_greentexts", newSViv(keyint(post->stat_greentexts))); */
+    /* hv_stores(ssn_post_hv, "stat_dope", newSViv(keyint(post->stat_dope))); */
+    /* hv_stores(ssn_post_hv, "stat_oneclicksoftware", newSViv(keyint(post->stat_oneclicksoftware))); */
+    /* hv_stores(ssn_post_hv, "stat_emojo_likes", newSViv(keyint(post->stat_emojo_likes))); */
+    /* hv_stores(ssn_post_hv, "stat_hide_muted", newSViv(keyint(post->stat_hide_muted))); */
+    /* hv_stores(ssn_post_hv, "instance_show_shoutbox", newSViv(keyint(post->instance_show_shoutbox))); */
+    /* hv_stores(ssn_post_hv, "instance_panel", newSViv(keyint(post->instance_panel))); */
+    /* hv_stores(ssn_post_hv, "notif_embed", newSViv(keyint(post->notif_embed))); */
+    /* hv_stores(ssn_post_hv, "set", newSViv(keyint(post->set))); */
+    /* hv_stores(ssn_post_hv, "only_media", newSViv(keyint(post->only_media))); */
+    /* hv_stores(ssn_post_hv, "replies_only", newSViv(keyint(post->replies_only))); */
+    /* hv_stores(ssn_post_hv, "replies_policy", newSViv(keyint(post->replies_policy))); */
+    /* hv_stores(ssn_post_hv, "emojoindex", newSViv(keyint(post->emojoindex))); */
+    /* hv_stores(ssn_post_hv, "sidebar_opacity", newSViv(keyint(post->sidebar_opacity))); */
+    /* hv_stores(ssn_post_hv, "file_ids", newSVpv(keystr(post->file_ids), 0)); */
+    /* hv_stores(ssn_post_hv, "content", newSVpv(keystr(post->content), 0)); */
+    /* hv_stores(ssn_post_hv, "itype", newSVpv(keystr(post->itype), 0)); */
+    /* hv_stores(ssn_post_hv, "id", newSVpv(keystr(post->id), 0)); */
+    /* hv_stores(ssn_post_hv, "username", newSVpv(keystr(post->username), 0)); */
+    /* hv_stores(ssn_post_hv, "password", newSVpv(keystr(post->password), 0)); */
+    /* hv_stores(ssn_post_hv, "replyid", newSVpv(keystr(post->replyid), 0)); */
+    /* hv_stores(ssn_post_hv, "visibility", newSVpv(keystr(post->visibility), 0)); */
+    /* hv_stores(ssn_post_hv, "instance", newSVpv(keystr(post->instance), 0)); */
+    /* hv_stores(ssn_post_hv, "min_id", newSVpv(keystr(post->min_id), 0)); */
+    /* hv_stores(ssn_post_hv, "max_id", newSVpv(keystr(post->max_id), 0)); */
+    /* hv_stores(ssn_post_hv, "start_id", newSVpv(keystr(post->start_id), 0)); */
 
     return ssn_post_hv;
 }
diff --git a/src/timeline.c b/src/timeline.c
index ab4293b..b5cf850 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -43,8 +43,8 @@ void content_timeline(REQUEST_T req,
 {
     PERL_STACK_INIT;
     HV* session_hv = perlify_session(ssn);
-    XPUSHs(newRV_noinc((SV*)session_hv));
-    XPUSHs(newRV_noinc((SV*)template_files));
+    mXPUSHs(newRV_inc((SV*)session_hv));
+    mXPUSHs(newRV_inc((SV*)template_files));
     
     if (statuses)
         mXPUSHs(newRV_noinc((SV*)perlify_statuses(statuses, statuses_len)));

From bb8dedb37e85cfbca14c4ca2ebbf08bb89e196df Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 13 Oct 2022 11:32:26 +0000
Subject: [PATCH 138/143] Uncomment code

FossilOrigin-Name: 86b1b76ca8f2b42a92c7099649f3f8c0f6bb704056645116dac6715aa935e324
---
 src/query.c | 72 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/query.c b/src/query.c
index 8eb46e6..3763536 100644
--- a/src/query.c
+++ b/src/query.c
@@ -276,42 +276,42 @@ HV* perlify_post_values(struct post_values* post)
     HV* ssn_post_hv = newHV();
 
     // This ugly...
-    /* hv_stores(ssn_post_hv, "theme", newSVpv(keystr(post->theme), 0)); */
-    /* hv_stores(ssn_post_hv, "themeclr", newSViv(keyint(post->themeclr))); */
-    /* hv_stores(ssn_post_hv, "lang", newSViv(keyint(post->lang))); */
-    /* hv_stores(ssn_post_hv, "title", newSViv(keyint(post->title))); */
-    /* hv_stores(ssn_post_hv, "jsactions", newSViv(keyint(post->jsactions))); */
-    /* hv_stores(ssn_post_hv, "jsreply", newSViv(keyint(post->jsreply))); */
-    /* hv_stores(ssn_post_hv, "jslive", newSViv(keyint(post->jslive))); */
-    /* hv_stores(ssn_post_hv, "js", newSViv(keyint(post->js))); */
-    /* hv_stores(ssn_post_hv, "interact_img", newSViv(keyint(post->interact_img))); */
-    /* hv_stores(ssn_post_hv, "stat_attachments", newSViv(keyint(post->stat_attachments))); */
-    /* hv_stores(ssn_post_hv, "stat_greentexts", newSViv(keyint(post->stat_greentexts))); */
-    /* hv_stores(ssn_post_hv, "stat_dope", newSViv(keyint(post->stat_dope))); */
-    /* hv_stores(ssn_post_hv, "stat_oneclicksoftware", newSViv(keyint(post->stat_oneclicksoftware))); */
-    /* hv_stores(ssn_post_hv, "stat_emojo_likes", newSViv(keyint(post->stat_emojo_likes))); */
-    /* hv_stores(ssn_post_hv, "stat_hide_muted", newSViv(keyint(post->stat_hide_muted))); */
-    /* hv_stores(ssn_post_hv, "instance_show_shoutbox", newSViv(keyint(post->instance_show_shoutbox))); */
-    /* hv_stores(ssn_post_hv, "instance_panel", newSViv(keyint(post->instance_panel))); */
-    /* hv_stores(ssn_post_hv, "notif_embed", newSViv(keyint(post->notif_embed))); */
-    /* hv_stores(ssn_post_hv, "set", newSViv(keyint(post->set))); */
-    /* hv_stores(ssn_post_hv, "only_media", newSViv(keyint(post->only_media))); */
-    /* hv_stores(ssn_post_hv, "replies_only", newSViv(keyint(post->replies_only))); */
-    /* hv_stores(ssn_post_hv, "replies_policy", newSViv(keyint(post->replies_policy))); */
-    /* hv_stores(ssn_post_hv, "emojoindex", newSViv(keyint(post->emojoindex))); */
-    /* hv_stores(ssn_post_hv, "sidebar_opacity", newSViv(keyint(post->sidebar_opacity))); */
-    /* hv_stores(ssn_post_hv, "file_ids", newSVpv(keystr(post->file_ids), 0)); */
-    /* hv_stores(ssn_post_hv, "content", newSVpv(keystr(post->content), 0)); */
-    /* hv_stores(ssn_post_hv, "itype", newSVpv(keystr(post->itype), 0)); */
-    /* hv_stores(ssn_post_hv, "id", newSVpv(keystr(post->id), 0)); */
-    /* hv_stores(ssn_post_hv, "username", newSVpv(keystr(post->username), 0)); */
-    /* hv_stores(ssn_post_hv, "password", newSVpv(keystr(post->password), 0)); */
-    /* hv_stores(ssn_post_hv, "replyid", newSVpv(keystr(post->replyid), 0)); */
-    /* hv_stores(ssn_post_hv, "visibility", newSVpv(keystr(post->visibility), 0)); */
-    /* hv_stores(ssn_post_hv, "instance", newSVpv(keystr(post->instance), 0)); */
-    /* hv_stores(ssn_post_hv, "min_id", newSVpv(keystr(post->min_id), 0)); */
-    /* hv_stores(ssn_post_hv, "max_id", newSVpv(keystr(post->max_id), 0)); */
-    /* hv_stores(ssn_post_hv, "start_id", newSVpv(keystr(post->start_id), 0)); */
+    hv_stores(ssn_post_hv, "theme", newSVpv(keystr(post->theme), 0));
+    hv_stores(ssn_post_hv, "themeclr", newSViv(keyint(post->themeclr)));
+    hv_stores(ssn_post_hv, "lang", newSViv(keyint(post->lang)));
+    hv_stores(ssn_post_hv, "title", newSViv(keyint(post->title)));
+    hv_stores(ssn_post_hv, "jsactions", newSViv(keyint(post->jsactions)));
+    hv_stores(ssn_post_hv, "jsreply", newSViv(keyint(post->jsreply)));
+    hv_stores(ssn_post_hv, "jslive", newSViv(keyint(post->jslive)));
+    hv_stores(ssn_post_hv, "js", newSViv(keyint(post->js)));
+    hv_stores(ssn_post_hv, "interact_img", newSViv(keyint(post->interact_img)));
+    hv_stores(ssn_post_hv, "stat_attachments", newSViv(keyint(post->stat_attachments)));
+    hv_stores(ssn_post_hv, "stat_greentexts", newSViv(keyint(post->stat_greentexts)));
+    hv_stores(ssn_post_hv, "stat_dope", newSViv(keyint(post->stat_dope)));
+    hv_stores(ssn_post_hv, "stat_oneclicksoftware", newSViv(keyint(post->stat_oneclicksoftware)));
+    hv_stores(ssn_post_hv, "stat_emojo_likes", newSViv(keyint(post->stat_emojo_likes)));
+    hv_stores(ssn_post_hv, "stat_hide_muted", newSViv(keyint(post->stat_hide_muted)));
+    hv_stores(ssn_post_hv, "instance_show_shoutbox", newSViv(keyint(post->instance_show_shoutbox)));
+    hv_stores(ssn_post_hv, "instance_panel", newSViv(keyint(post->instance_panel)));
+    hv_stores(ssn_post_hv, "notif_embed", newSViv(keyint(post->notif_embed)));
+    hv_stores(ssn_post_hv, "set", newSViv(keyint(post->set)));
+    hv_stores(ssn_post_hv, "only_media", newSViv(keyint(post->only_media)));
+    hv_stores(ssn_post_hv, "replies_only", newSViv(keyint(post->replies_only)));
+    hv_stores(ssn_post_hv, "replies_policy", newSViv(keyint(post->replies_policy)));
+    hv_stores(ssn_post_hv, "emojoindex", newSViv(keyint(post->emojoindex)));
+    hv_stores(ssn_post_hv, "sidebar_opacity", newSViv(keyint(post->sidebar_opacity)));
+    hv_stores(ssn_post_hv, "file_ids", newSVpv(keystr(post->file_ids), 0));
+    hv_stores(ssn_post_hv, "content", newSVpv(keystr(post->content), 0));
+    hv_stores(ssn_post_hv, "itype", newSVpv(keystr(post->itype), 0));
+    hv_stores(ssn_post_hv, "id", newSVpv(keystr(post->id), 0));
+    hv_stores(ssn_post_hv, "username", newSVpv(keystr(post->username), 0));
+    hv_stores(ssn_post_hv, "password", newSVpv(keystr(post->password), 0));
+    hv_stores(ssn_post_hv, "replyid", newSVpv(keystr(post->replyid), 0));
+    hv_stores(ssn_post_hv, "visibility", newSVpv(keystr(post->visibility), 0));
+    hv_stores(ssn_post_hv, "instance", newSVpv(keystr(post->instance), 0));
+    hv_stores(ssn_post_hv, "min_id", newSVpv(keystr(post->min_id), 0));
+    hv_stores(ssn_post_hv, "max_id", newSVpv(keystr(post->max_id), 0));
+    hv_stores(ssn_post_hv, "start_id", newSVpv(keystr(post->start_id), 0));
 
     return ssn_post_hv;
 }

From 4eb138941823427e7e059e53e05a97859d026f2c Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 13 Oct 2022 17:55:59 +0000
Subject: [PATCH 139/143] CSS tweaks and polishing

FossilOrigin-Name: 9d32ddd347cb36062c661df3775a4d7a775e82f9dde7eab9405782f38b876fbb
---
 dist/treebird.css  | 79 +++++++++++++++++++++++++++++++++++++++++++++-
 perl/login.pm      |  2 ++
 templates/login.tt | 20 +++++++-----
 3 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index 11beeab..5b74488 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -13,6 +13,18 @@
     --account-overlay-gradient-bottom: #dadada;
 }
 
+
+*
+{
+    transition: .1s box-shadow;
+}
+
+*:focus
+{
+    outline: 1px solid #aa0000;
+    box-shadow: 0px 0px 6px #aa00006f;
+}
+
 *
 {
     margin: 0;
@@ -119,7 +131,7 @@ table.ui-table td
 
 #navbar
 {
-    background: linear-gradient(#fbfbfb 40%, #efefef 50%, #e4e4e9);
+    background: linear-gradient(#fbfbfb 40%, #f5f5f5 50%, #efefef);
     width: 1000px;
     border-bottom: 2px solid #bfbfc4;
     z-index: 999;
@@ -159,6 +171,26 @@ table.ui-table td
     margin: 6px 0px 6px 18px;
 }
 
+#navbar a,
+#navbar a:focus
+{
+    box-shadow: 0px 0px 0px #00000000 !important;
+    outline: 0 !important;
+}
+
+#navbar a img
+{
+    transition: .4s transform, .4s filter;
+}
+
+#navbar a:focus img
+{
+    box-shadow: 0px 0px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 !important;
+    transform: rotateZ(360deg);
+    filter: drop-shadow(0px 0px 3px #aa00006f);
+}
+
 #navbar span.info
 {
     vertical-align: middle;
@@ -273,7 +305,20 @@ table.ui-table td
 
 #searchbox
 {
+    padding-top: unset;
+    padding-bottom: unset;
+    height: 26px;
+    border-right: unset;
     padding-left: 27px;
+    transition: width .1s ease;
+    width: 180px;
+}
+
+#searchbox:focus
+{
+    box-shadow: 0;
+    outline: 0;
+    width: 300px;
 }
 
 .results-header
@@ -338,6 +383,14 @@ table.ui-table td
     font-weight: bold;
 }
 
+input[type=text],
+input[type=url],
+input[type=email],
+input[type=password]
+{
+    padding: 2px;
+    border: 1px solid #d3d3d3;
+}
 
 .menu.menu-compact .btn-menu,
 .status-compact .menu-container .menu .btn-menu
@@ -1352,6 +1405,22 @@ input[type=checkbox].hidden:not(:checked) + .sidebar-submenu
     border-bottom-right-radius: 5px;
 }
 
+.text-gap-hairline
+{
+    display: inline-block;
+    width: 64px;
+    text-align: center;
+    height: 1px;
+    background-color: #d3d3d3;
+    margin: 2px;
+}
+
+.text-gap-hairline + h6
+{
+    display: inline;
+    font-variant: small-caps;
+}
+
 /*************************
  *     Config            *
  ************************/
@@ -1986,6 +2055,14 @@ input[type=radio].hidden:not(:checked) + .emoji-picker-emojos
     display: block;
 }
 
+.form-group label
+{
+    display: inline-block;
+    min-width: 70px;
+    font-size: 0.9rem;
+    text-align: middle;
+}
+
 /* Simple page layout */
 .simple-page
 {
diff --git a/perl/login.pm b/perl/login.pm
index dbdfcfd..315a684 100644
--- a/perl/login.pm
+++ b/perl/login.pm
@@ -6,6 +6,7 @@ use Exporter 'import';
 
 our @EXPORT = qw( content_login );
 
+use l10n 'lang';
 use template_helpers 'to_template';
 
 sub content_login
@@ -14,6 +15,7 @@ sub content_login
 
     my %vars = (
         error => $error,
+        lang => \&lang,
         );
     
     to_template(\%vars, \$data->{'login.tt'});
diff --git a/templates/login.tt b/templates/login.tt
index ee04092..6b0cadb 100644
--- a/templates/login.tt
+++ b/templates/login.tt
@@ -1,29 +1,33 @@
 <div class="simple-page">
-    <h1>{{%s:login_header}}</h1>
-    
-    {{%s:error}}
+    <h1>[% lang('LOGIN') %]</h1>
+
+    [% IF error %]
+        <span class="e-error error-pad">
+            $error
+        </span>
+    [% END %]
 
     <form action="/login" method="post">
         <div class="form-group">
-            <label for="login-username">{{%s:username}}: </label>
+            <label for="login-username">[% lang('LOGIN') %]: </label>
             <input type="text" id="login-username" name="username">
         </div>
         <div class="form-group">
-            <label for="login-password">{{%s:password}}: </label>
+            <label for="login-password">[% lang('PASSWORD') %]: </label>
             <input type="password" id="login-password" name="password"><br>
         </div>
         <div class="form-group">
-            <input class="btn" type="submit" value="{{%s:login_submit}}">
+            <input class="btn" type="submit" value="[% lang('LOGIN_BTN') %]">
         </div>
     </form>
 
-    <h6>{{%s:instance_text}}</h6>
+    <div class="text-gap-hairline"></div><h6> OR </h6><div class="text-gap-hairline"></div>
 
     <form action="/login/oauth" method="post">
         <div class="form-group">
             <label for="instance-url">{{%s:instance_url}}: </label>
             <input type="url" id="instance-url" name="instance">
-            <input class="btn" type="submit" value="{{%s:instance_submit}}">
+            <input class="btn btn-single" type="submit" value="{{%s:instance_submit}}">
         </div>
     </form>
 </div>

From c2b64cdf335239a2837859658292926e8a7fe3d4 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Thu, 13 Oct 2022 18:50:06 +0000
Subject: [PATCH 140/143] JS cleanup

FossilOrigin-Name: 3a671f85951c708f37ded7345e0e4207e4e5031b7bd2c840cb91d74288740a99
---
 dist/js/main.js | 55 ++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/dist/js/main.js b/dist/js/main.js
index 3e1ba95..1dd0b11 100644
--- a/dist/js/main.js
+++ b/dist/js/main.js
@@ -133,32 +133,40 @@
         });
     }
 
-    function status_interact_props(e)
+    function status_event(e)
     {
-        let interact = e.target.closest(".statbtn");
-        let type = interact.parentNode.querySelector(".itype");
-        if (type === null)
-            return true;
-        let status = interact.closest(".status");
+        let target = e.target.closest(".statbtn");
+        console.log(target);
+        if (target)
+        {
+            // Don't JS these
+            if (target.classList.contains("reply-btn") || target.classList.contains("view-btn"))
+                return true;
+            let type = target.parentNode.querySelector(".itype");
+            if (type === null)
+                return true;
+            let status = e.srcElement;
 
-        send_request("/treebird_api/v1/interact",
-                     {
-                         id: status.id,
-                         itype: type.value
-                     },
-                     "POST",
-                     (xhr, args) => {
-                         if (xhr.status !== 200)
+            send_request("/treebird_api/v1/interact",
                          {
-                             // Undo action if failure
-                             interact_action(status, type);
-                         }
-                     }, null);
+                             id: status.id,
+                             itype: type.value
+                         },
+                         "POST",
+                         (xhr, args) => {
+                             if (xhr.status !== 200)
+                             {
+                                 // Undo action if failure
+                                 interact_action(status, type);
+                             }
+                         }, null);
 
-        interact_action(status, type);
-        
+            interact_action(status, type);
+            
+            e.preventDefault();
+            return false;
+        }
         e.preventDefault();
-        return false;
     }
 
     function frame_resize()
@@ -279,13 +287,12 @@
 
     // Main (when loaded)
     document.addEventListener('DOMContentLoaded', () => {
-        let reply_btn = document.getElementsByClassName("reply-btn");
-        let interact_btn = document.getElementsByClassName("statbtn");
+        let interact_btn = document.getElementsByClassName("status");
 
         // Add event listener to add specificied buttons
         for (let i = 0; i < interact_btn.length; ++i)
         {
-            interact_btn[i].addEventListener('click', status_interact_props);
+            interact_btn[i].addEventListener('click', status_event);
         }
         
         // Resize notifications iFrame to full height

From cb0b676cd7d62dc21c5e98fc1607edc74b461fec Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 14 Oct 2022 01:51:43 +0000
Subject: [PATCH 141/143] Bundle webshitter lib

FossilOrigin-Name: ce5d7f4522f9b7a75ed918b58ba51473975f37d7c9e11a273f5648c481dc14d9
---
 README.md            |   4 +-
 dist/js/redom.js     | 755 +++++++++++++++++++++++++++++++++++++++++++
 dist/js/redom.min.js |   1 +
 dist/treebird.css    |   9 +-
 perl/main.pl         |  15 +-
 templates/login.tt   |   4 +-
 6 files changed, 776 insertions(+), 12 deletions(-)
 create mode 100644 dist/js/redom.js
 create mode 100644 dist/js/redom.min.js

diff --git a/README.md b/README.md
index 50ba5b6..d672fe0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,9 @@ The goal is to create a frontend that's lightweight enough to be viewed without
 usable enough to improve the experience with JS.
 
 Treebird uses C with FCGI, mastodont-c (library designed for Treebird, but can be used
-for other applications as well), and plain JavaScript for the frontend (100% optional).
+for other applications as well), and **optional** JavaScript for the frontend (100% functional without
+javascript, it only helps). Uses [RE:DOM](https://redom.js.org/) (3kb js library) to assist with DOM
+creation and native JS apis. (bundled, no need to build)
 
 ## Why?
 
diff --git a/dist/js/redom.js b/dist/js/redom.js
new file mode 100644
index 0000000..0bfc134
--- /dev/null
+++ b/dist/js/redom.js
@@ -0,0 +1,755 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.redom = {}));
+})(this, (function (exports) { 'use strict';
+
+  function createElement (query, ns) {
+    var ref = parse(query);
+    var tag = ref.tag;
+    var id = ref.id;
+    var className = ref.className;
+    var element = ns ? document.createElementNS(ns, tag) : document.createElement(tag);
+
+    if (id) {
+      element.id = id;
+    }
+
+    if (className) {
+      if (ns) {
+        element.setAttribute('class', className);
+      } else {
+        element.className = className;
+      }
+    }
+
+    return element;
+  }
+
+  function parse (query) {
+    var chunks = query.split(/([.#])/);
+    var className = '';
+    var id = '';
+
+    for (var i = 1; i < chunks.length; i += 2) {
+      switch (chunks[i]) {
+        case '.':
+          className += " " + (chunks[i + 1]);
+          break;
+
+        case '#':
+          id = chunks[i + 1];
+      }
+    }
+
+    return {
+      className: className.trim(),
+      tag: chunks[0] || 'div',
+      id: id
+    };
+  }
+
+  function unmount (parent, child) {
+    var parentEl = getEl(parent);
+    var childEl = getEl(child);
+
+    if (child === childEl && childEl.__redom_view) {
+      // try to look up the view if not provided
+      child = childEl.__redom_view;
+    }
+
+    if (childEl.parentNode) {
+      doUnmount(child, childEl, parentEl);
+
+      parentEl.removeChild(childEl);
+    }
+
+    return child;
+  }
+
+  function doUnmount (child, childEl, parentEl) {
+    var hooks = childEl.__redom_lifecycle;
+
+    if (hooksAreEmpty(hooks)) {
+      childEl.__redom_lifecycle = {};
+      return;
+    }
+
+    var traverse = parentEl;
+
+    if (childEl.__redom_mounted) {
+      trigger(childEl, 'onunmount');
+    }
+
+    while (traverse) {
+      var parentHooks = traverse.__redom_lifecycle || {};
+
+      for (var hook in hooks) {
+        if (parentHooks[hook]) {
+          parentHooks[hook] -= hooks[hook];
+        }
+      }
+
+      if (hooksAreEmpty(parentHooks)) {
+        traverse.__redom_lifecycle = null;
+      }
+
+      traverse = traverse.parentNode;
+    }
+  }
+
+  function hooksAreEmpty (hooks) {
+    if (hooks == null) {
+      return true;
+    }
+    for (var key in hooks) {
+      if (hooks[key]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /* global Node, ShadowRoot */
+
+  var hookNames = ['onmount', 'onremount', 'onunmount'];
+  var shadowRootAvailable = typeof window !== 'undefined' && 'ShadowRoot' in window;
+
+  function mount (parent, child, before, replace) {
+    var parentEl = getEl(parent);
+    var childEl = getEl(child);
+
+    if (child === childEl && childEl.__redom_view) {
+      // try to look up the view if not provided
+      child = childEl.__redom_view;
+    }
+
+    if (child !== childEl) {
+      childEl.__redom_view = child;
+    }
+
+    var wasMounted = childEl.__redom_mounted;
+    var oldParent = childEl.parentNode;
+
+    if (wasMounted && (oldParent !== parentEl)) {
+      doUnmount(child, childEl, oldParent);
+    }
+
+    if (before != null) {
+      if (replace) {
+        var beforeEl = getEl(before);
+
+        if (beforeEl.__redom_mounted) {
+          trigger(beforeEl, 'onunmount');
+        }
+
+        parentEl.replaceChild(childEl, beforeEl);
+      } else {
+        parentEl.insertBefore(childEl, getEl(before));
+      }
+    } else {
+      parentEl.appendChild(childEl);
+    }
+
+    doMount(child, childEl, parentEl, oldParent);
+
+    return child;
+  }
+
+  function trigger (el, eventName) {
+    if (eventName === 'onmount' || eventName === 'onremount') {
+      el.__redom_mounted = true;
+    } else if (eventName === 'onunmount') {
+      el.__redom_mounted = false;
+    }
+
+    var hooks = el.__redom_lifecycle;
+
+    if (!hooks) {
+      return;
+    }
+
+    var view = el.__redom_view;
+    var hookCount = 0;
+
+    view && view[eventName] && view[eventName]();
+
+    for (var hook in hooks) {
+      if (hook) {
+        hookCount++;
+      }
+    }
+
+    if (hookCount) {
+      var traverse = el.firstChild;
+
+      while (traverse) {
+        var next = traverse.nextSibling;
+
+        trigger(traverse, eventName);
+
+        traverse = next;
+      }
+    }
+  }
+
+  function doMount (child, childEl, parentEl, oldParent) {
+    var hooks = childEl.__redom_lifecycle || (childEl.__redom_lifecycle = {});
+    var remount = (parentEl === oldParent);
+    var hooksFound = false;
+
+    for (var i = 0, list = hookNames; i < list.length; i += 1) {
+      var hookName = list[i];
+
+      if (!remount) { // if already mounted, skip this phase
+        if (child !== childEl) { // only Views can have lifecycle events
+          if (hookName in child) {
+            hooks[hookName] = (hooks[hookName] || 0) + 1;
+          }
+        }
+      }
+      if (hooks[hookName]) {
+        hooksFound = true;
+      }
+    }
+
+    if (!hooksFound) {
+      childEl.__redom_lifecycle = {};
+      return;
+    }
+
+    var traverse = parentEl;
+    var triggered = false;
+
+    if (remount || (traverse && traverse.__redom_mounted)) {
+      trigger(childEl, remount ? 'onremount' : 'onmount');
+      triggered = true;
+    }
+
+    while (traverse) {
+      var parent = traverse.parentNode;
+      var parentHooks = traverse.__redom_lifecycle || (traverse.__redom_lifecycle = {});
+
+      for (var hook in hooks) {
+        parentHooks[hook] = (parentHooks[hook] || 0) + hooks[hook];
+      }
+
+      if (triggered) {
+        break;
+      } else {
+        if (traverse.nodeType === Node.DOCUMENT_NODE ||
+          (shadowRootAvailable && (traverse instanceof ShadowRoot)) ||
+          (parent && parent.__redom_mounted)
+        ) {
+          trigger(traverse, remount ? 'onremount' : 'onmount');
+          triggered = true;
+        }
+        traverse = parent;
+      }
+    }
+  }
+
+  function setStyle (view, arg1, arg2) {
+    var el = getEl(view);
+
+    if (typeof arg1 === 'object') {
+      for (var key in arg1) {
+        setStyleValue(el, key, arg1[key]);
+      }
+    } else {
+      setStyleValue(el, arg1, arg2);
+    }
+  }
+
+  function setStyleValue (el, key, value) {
+    el.style[key] = value == null ? '' : value;
+  }
+
+  /* global SVGElement */
+
+  var xlinkns = 'http://www.w3.org/1999/xlink';
+
+  function setAttr (view, arg1, arg2) {
+    setAttrInternal(view, arg1, arg2);
+  }
+
+  function setAttrInternal (view, arg1, arg2, initial) {
+    var el = getEl(view);
+
+    var isObj = typeof arg1 === 'object';
+
+    if (isObj) {
+      for (var key in arg1) {
+        setAttrInternal(el, key, arg1[key], initial);
+      }
+    } else {
+      var isSVG = el instanceof SVGElement;
+      var isFunc = typeof arg2 === 'function';
+
+      if (arg1 === 'style' && typeof arg2 === 'object') {
+        setStyle(el, arg2);
+      } else if (isSVG && isFunc) {
+        el[arg1] = arg2;
+      } else if (arg1 === 'dataset') {
+        setData(el, arg2);
+      } else if (!isSVG && (arg1 in el || isFunc) && (arg1 !== 'list')) {
+        el[arg1] = arg2;
+      } else {
+        if (isSVG && (arg1 === 'xlink')) {
+          setXlink(el, arg2);
+          return;
+        }
+        if (initial && arg1 === 'class') {
+          arg2 = el.className + ' ' + arg2;
+        }
+        if (arg2 == null) {
+          el.removeAttribute(arg1);
+        } else {
+          el.setAttribute(arg1, arg2);
+        }
+      }
+    }
+  }
+
+  function setXlink (el, arg1, arg2) {
+    if (typeof arg1 === 'object') {
+      for (var key in arg1) {
+        setXlink(el, key, arg1[key]);
+      }
+    } else {
+      if (arg2 != null) {
+        el.setAttributeNS(xlinkns, arg1, arg2);
+      } else {
+        el.removeAttributeNS(xlinkns, arg1, arg2);
+      }
+    }
+  }
+
+  function setData (el, arg1, arg2) {
+    if (typeof arg1 === 'object') {
+      for (var key in arg1) {
+        setData(el, key, arg1[key]);
+      }
+    } else {
+      if (arg2 != null) {
+        el.dataset[arg1] = arg2;
+      } else {
+        delete el.dataset[arg1];
+      }
+    }
+  }
+
+  function text (str) {
+    return document.createTextNode((str != null) ? str : '');
+  }
+
+  function parseArgumentsInternal (element, args, initial) {
+    for (var i = 0, list = args; i < list.length; i += 1) {
+      var arg = list[i];
+
+      if (arg !== 0 && !arg) {
+        continue;
+      }
+
+      var type = typeof arg;
+
+      if (type === 'function') {
+        arg(element);
+      } else if (type === 'string' || type === 'number') {
+        element.appendChild(text(arg));
+      } else if (isNode(getEl(arg))) {
+        mount(element, arg);
+      } else if (arg.length) {
+        parseArgumentsInternal(element, arg, initial);
+      } else if (type === 'object') {
+        setAttrInternal(element, arg, null, initial);
+      }
+    }
+  }
+
+  function ensureEl (parent) {
+    return typeof parent === 'string' ? html(parent) : getEl(parent);
+  }
+
+  function getEl (parent) {
+    return (parent.nodeType && parent) || (!parent.el && parent) || getEl(parent.el);
+  }
+
+  function isNode (arg) {
+    return arg && arg.nodeType;
+  }
+
+  function html (query) {
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+    var element;
+
+    var type = typeof query;
+
+    if (type === 'string') {
+      element = createElement(query);
+    } else if (type === 'function') {
+      var Query = query;
+      element = new (Function.prototype.bind.apply( Query, [ null ].concat( args) ));
+    } else {
+      throw new Error('At least one argument required');
+    }
+
+    parseArgumentsInternal(getEl(element), args, true);
+
+    return element;
+  }
+
+  var el = html;
+  var h = html;
+
+  html.extend = function extendHtml () {
+    var args = [], len = arguments.length;
+    while ( len-- ) args[ len ] = arguments[ len ];
+
+    return html.bind.apply(html, [ this ].concat( args ));
+  };
+
+  function setChildren (parent) {
+    var children = [], len = arguments.length - 1;
+    while ( len-- > 0 ) children[ len ] = arguments[ len + 1 ];
+
+    var parentEl = getEl(parent);
+    var current = traverse(parent, children, parentEl.firstChild);
+
+    while (current) {
+      var next = current.nextSibling;
+
+      unmount(parent, current);
+
+      current = next;
+    }
+  }
+
+  function traverse (parent, children, _current) {
+    var current = _current;
+
+    var childEls = Array(children.length);
+
+    for (var i = 0; i < children.length; i++) {
+      childEls[i] = children[i] && getEl(children[i]);
+    }
+
+    for (var i$1 = 0; i$1 < children.length; i$1++) {
+      var child = children[i$1];
+
+      if (!child) {
+        continue;
+      }
+
+      var childEl = childEls[i$1];
+
+      if (childEl === current) {
+        current = current.nextSibling;
+        continue;
+      }
+
+      if (isNode(childEl)) {
+        var next = current && current.nextSibling;
+        var exists = child.__redom_index != null;
+        var replace = exists && next === childEls[i$1 + 1];
+
+        mount(parent, child, current, replace);
+
+        if (replace) {
+          current = next;
+        }
+
+        continue;
+      }
+
+      if (child.length != null) {
+        current = traverse(parent, child, current);
+      }
+    }
+
+    return current;
+  }
+
+  function listPool (View, key, initData) {
+    return new ListPool(View, key, initData);
+  }
+
+  var ListPool = function ListPool (View, key, initData) {
+    this.View = View;
+    this.initData = initData;
+    this.oldLookup = {};
+    this.lookup = {};
+    this.oldViews = [];
+    this.views = [];
+
+    if (key != null) {
+      this.key = typeof key === 'function' ? key : propKey(key);
+    }
+  };
+
+  ListPool.prototype.update = function update (data, context) {
+    var ref = this;
+      var View = ref.View;
+      var key = ref.key;
+      var initData = ref.initData;
+    var keySet = key != null;
+
+    var oldLookup = this.lookup;
+    var newLookup = {};
+
+    var newViews = Array(data.length);
+    var oldViews = this.views;
+
+    for (var i = 0; i < data.length; i++) {
+      var item = data[i];
+      var view = (void 0);
+
+      if (keySet) {
+        var id = key(item);
+
+        view = oldLookup[id] || new View(initData, item, i, data);
+        newLookup[id] = view;
+        view.__redom_id = id;
+      } else {
+        view = oldViews[i] || new View(initData, item, i, data);
+      }
+      view.update && view.update(item, i, data, context);
+
+      var el = getEl(view.el);
+
+      el.__redom_view = view;
+      newViews[i] = view;
+    }
+
+    this.oldViews = oldViews;
+    this.views = newViews;
+
+    this.oldLookup = oldLookup;
+    this.lookup = newLookup;
+  };
+
+  function propKey (key) {
+    return function (item) {
+      return item[key];
+    };
+  }
+
+  function list (parent, View, key, initData) {
+    return new List(parent, View, key, initData);
+  }
+
+  var List = function List (parent, View, key, initData) {
+    this.View = View;
+    this.initData = initData;
+    this.views = [];
+    this.pool = new ListPool(View, key, initData);
+    this.el = ensureEl(parent);
+    this.keySet = key != null;
+  };
+
+  List.prototype.update = function update (data, context) {
+      if ( data === void 0 ) data = [];
+
+    var ref = this;
+      var keySet = ref.keySet;
+    var oldViews = this.views;
+
+    this.pool.update(data, context);
+
+    var ref$1 = this.pool;
+      var views = ref$1.views;
+      var lookup = ref$1.lookup;
+
+    if (keySet) {
+      for (var i = 0; i < oldViews.length; i++) {
+        var oldView = oldViews[i];
+        var id = oldView.__redom_id;
+
+        if (lookup[id] == null) {
+          oldView.__redom_index = null;
+          unmount(this, oldView);
+        }
+      }
+    }
+
+    for (var i$1 = 0; i$1 < views.length; i$1++) {
+      var view = views[i$1];
+
+      view.__redom_index = i$1;
+    }
+
+    setChildren(this, views);
+
+    if (keySet) {
+      this.lookup = lookup;
+    }
+    this.views = views;
+  };
+
+  List.extend = function extendList (parent, View, key, initData) {
+    return List.bind(List, parent, View, key, initData);
+  };
+
+  list.extend = List.extend;
+
+  /* global Node */
+
+  function place (View, initData) {
+    return new Place(View, initData);
+  }
+
+  var Place = function Place (View, initData) {
+    this.el = text('');
+    this.visible = false;
+    this.view = null;
+    this._placeholder = this.el;
+
+    if (View instanceof Node) {
+      this._el = View;
+    } else if (View.el instanceof Node) {
+      this._el = View;
+      this.view = View;
+    } else {
+      this._View = View;
+    }
+
+    this._initData = initData;
+  };
+
+  Place.prototype.update = function update (visible, data) {
+    var placeholder = this._placeholder;
+    var parentNode = this.el.parentNode;
+
+    if (visible) {
+      if (!this.visible) {
+        if (this._el) {
+          mount(parentNode, this._el, placeholder);
+          unmount(parentNode, placeholder);
+
+          this.el = getEl(this._el);
+          this.visible = visible;
+        } else {
+          var View = this._View;
+          var view = new View(this._initData);
+
+          this.el = getEl(view);
+          this.view = view;
+
+          mount(parentNode, view, placeholder);
+          unmount(parentNode, placeholder);
+        }
+      }
+      this.view && this.view.update && this.view.update(data);
+    } else {
+      if (this.visible) {
+        if (this._el) {
+          mount(parentNode, placeholder, this._el);
+          unmount(parentNode, this._el);
+
+          this.el = placeholder;
+          this.visible = visible;
+
+          return;
+        }
+        mount(parentNode, placeholder, this.view);
+        unmount(parentNode, this.view);
+
+        this.el = placeholder;
+        this.view = null;
+      }
+    }
+    this.visible = visible;
+  };
+
+  /* global Node */
+
+  function router (parent, Views, initData) {
+    return new Router(parent, Views, initData);
+  }
+
+  var Router = function Router (parent, Views, initData) {
+    this.el = ensureEl(parent);
+    this.Views = Views;
+    this.initData = initData;
+  };
+
+  Router.prototype.update = function update (route, data) {
+    if (route !== this.route) {
+      var Views = this.Views;
+      var View = Views[route];
+
+      this.route = route;
+
+      if (View && (View instanceof Node || View.el instanceof Node)) {
+        this.view = View;
+      } else {
+        this.view = View && new View(this.initData, data);
+      }
+
+      setChildren(this.el, [this.view]);
+    }
+    this.view && this.view.update && this.view.update(data, route);
+  };
+
+  var ns = 'http://www.w3.org/2000/svg';
+
+  function svg (query) {
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+    var element;
+
+    var type = typeof query;
+
+    if (type === 'string') {
+      element = createElement(query, ns);
+    } else if (type === 'function') {
+      var Query = query;
+      element = new (Function.prototype.bind.apply( Query, [ null ].concat( args) ));
+    } else {
+      throw new Error('At least one argument required');
+    }
+
+    parseArgumentsInternal(getEl(element), args, true);
+
+    return element;
+  }
+
+  var s = svg;
+
+  svg.extend = function extendSvg () {
+    var args = [], len = arguments.length;
+    while ( len-- ) args[ len ] = arguments[ len ];
+
+    return svg.bind.apply(svg, [ this ].concat( args ));
+  };
+
+  svg.ns = ns;
+
+  exports.List = List;
+  exports.ListPool = ListPool;
+  exports.Place = Place;
+  exports.Router = Router;
+  exports.el = el;
+  exports.h = h;
+  exports.html = html;
+  exports.list = list;
+  exports.listPool = listPool;
+  exports.mount = mount;
+  exports.place = place;
+  exports.router = router;
+  exports.s = s;
+  exports.setAttr = setAttr;
+  exports.setChildren = setChildren;
+  exports.setData = setData;
+  exports.setStyle = setStyle;
+  exports.setXlink = setXlink;
+  exports.svg = svg;
+  exports.text = text;
+  exports.unmount = unmount;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));
diff --git a/dist/js/redom.min.js b/dist/js/redom.min.js
new file mode 100644
index 0000000..b849b1d
--- /dev/null
+++ b/dist/js/redom.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).redom={})}(this,(function(e){"use strict";function t(e,t){var i=function(e){for(var t=e.split(/([.#])/),i="",n="",o=1;o<t.length;o+=2)switch(t[o]){case".":i+=" "+t[o+1];break;case"#":n=t[o+1]}return{className:i.trim(),tag:t[0]||"div",id:n}}(e),n=i.tag,o=i.id,r=i.className,l=t?document.createElementNS(t,n):document.createElement(n);return o&&(l.id=o),r&&(t?l.setAttribute("class",r):l.className=r),l}function i(e,t){var i=w(e),o=w(t);return t===o&&o.__redom_view&&(t=o.__redom_view),o.parentNode&&(n(t,o,i),i.removeChild(o)),t}function n(e,t,i){var n=t.__redom_lifecycle;if(o(n))t.__redom_lifecycle={};else{var r=i;for(t.__redom_mounted&&u(t,"onunmount");r;){var l=r.__redom_lifecycle||{};for(var s in n)l[s]&&(l[s]-=n[s]);o(l)&&(r.__redom_lifecycle=null),r=r.parentNode}}}function o(e){if(null==e)return!0;for(var t in e)if(e[t])return!1;return!0}var r=["onmount","onremount","onunmount"],l="undefined"!=typeof window&&"ShadowRoot"in window;function s(e,t,i,o){var s=w(e),a=w(t);t===a&&a.__redom_view&&(t=a.__redom_view),t!==a&&(a.__redom_view=t);var f=a.__redom_mounted,d=a.parentNode;if(f&&d!==s&&n(0,a,d),null!=i)if(o){var h=w(i);h.__redom_mounted&&u(h,"onunmount"),s.replaceChild(a,h)}else s.insertBefore(a,w(i));else s.appendChild(a);return function(e,t,i,n){for(var o=t.__redom_lifecycle||(t.__redom_lifecycle={}),s=i===n,a=!1,f=0,d=r;f<d.length;f+=1){var h=d[f];s||e!==t&&h in e&&(o[h]=(o[h]||0)+1),o[h]&&(a=!0)}if(!a)return void(t.__redom_lifecycle={});var v=i,c=!1;(s||v&&v.__redom_mounted)&&(u(t,s?"onremount":"onmount"),c=!0);for(;v;){var _=v.parentNode,p=v.__redom_lifecycle||(v.__redom_lifecycle={});for(var m in o)p[m]=(p[m]||0)+o[m];if(c)break;(v.nodeType===Node.DOCUMENT_NODE||l&&v instanceof ShadowRoot||_&&_.__redom_mounted)&&(u(v,s?"onremount":"onmount"),c=!0),v=_}}(t,a,s,d),t}function u(e,t){"onmount"===t||"onremount"===t?e.__redom_mounted=!0:"onunmount"===t&&(e.__redom_mounted=!1);var i=e.__redom_lifecycle;if(i){var n=e.__redom_view,o=0;for(var r in n&&n[t]&&n[t](),i)r&&o++;if(o)for(var l=e.firstChild;l;){var s=l.nextSibling;u(l,t),l=s}}}function a(e,t,i){var n=w(e);if("object"==typeof t)for(var o in t)f(n,o,t[o]);else f(n,t,i)}function f(e,t,i){e.style[t]=null==i?"":i}var d="http://www.w3.org/1999/xlink";function h(e,t,i,n){var o=w(e);if("object"==typeof t)for(var r in t)h(o,r,t[r],n);else{var l=o instanceof SVGElement,s="function"==typeof i;if("style"===t&&"object"==typeof i)a(o,i);else if(l&&s)o[t]=i;else if("dataset"===t)c(o,i);else if(l||!(t in o)&&!s||"list"===t){if(l&&"xlink"===t)return void v(o,i);n&&"class"===t&&(i=o.className+" "+i),null==i?o.removeAttribute(t):o.setAttribute(t,i)}else o[t]=i}}function v(e,t,i){if("object"==typeof t)for(var n in t)v(e,n,t[n]);else null!=i?e.setAttributeNS(d,t,i):e.removeAttributeNS(d,t,i)}function c(e,t,i){if("object"==typeof t)for(var n in t)c(e,n,t[n]);else null!=i?e.dataset[t]=i:delete e.dataset[t]}function _(e){return document.createTextNode(null!=e?e:"")}function p(e,t,i){for(var n=0,o=t;n<o.length;n+=1){var r=o[n];if(0===r||r){var l=typeof r;"function"===l?r(e):"string"===l||"number"===l?e.appendChild(_(r)):y(w(r))?s(e,r):r.length?p(e,r,i):"object"===l&&h(e,r,null,i)}}}function m(e){return"string"==typeof e?g(e):w(e)}function w(e){return e.nodeType&&e||!e.el&&e||w(e.el)}function y(e){return e&&e.nodeType}function g(e){for(var i,n=[],o=arguments.length-1;o-- >0;)n[o]=arguments[o+1];var r=typeof e;if("string"===r)i=t(e);else{if("function"!==r)throw new Error("At least one argument required");var l=e;i=new(Function.prototype.bind.apply(l,[null].concat(n)))}return p(w(i),n,!0),i}var b=g,N=g;function x(e){for(var t=[],n=arguments.length-1;n-- >0;)t[n]=arguments[n+1];for(var o=w(e),r=k(e,t,o.firstChild);r;){var l=r.nextSibling;i(e,r),r=l}}function k(e,t,i){for(var n=i,o=Array(t.length),r=0;r<t.length;r++)o[r]=t[r]&&w(t[r]);for(var l=0;l<t.length;l++){var u=t[l];if(u){var a=o[l];if(a!==n)if(y(a)){var f=n&&n.nextSibling,d=null!=u.__redom_index&&f===o[l+1];s(e,u,n,d),d&&(n=f)}else null!=u.length&&(n=k(e,u,n));else n=n.nextSibling}}return n}g.extend=function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];return g.bind.apply(g,[this].concat(e))};var S=function(e,t,i){this.View=e,this.initData=i,this.oldLookup={},this.lookup={},this.oldViews=[],this.views=[],null!=t&&(this.key="function"==typeof t?t:function(e){return function(t){return t[e]}}(t))};function A(e,t,i,n){return new D(e,t,i,n)}S.prototype.update=function(e,t){for(var i=this,n=i.View,o=i.key,r=i.initData,l=null!=o,s=this.lookup,u={},a=Array(e.length),f=this.views,d=0;d<e.length;d++){var h=e[d],v=void 0;if(l){var c=o(h);v=s[c]||new n(r,h,d,e),u[c]=v,v.__redom_id=c}else v=f[d]||new n(r,h,d,e);v.update&&v.update(h,d,e,t),w(v.el).__redom_view=v,a[d]=v}this.oldViews=f,this.views=a,this.oldLookup=s,this.lookup=u};var D=function(e,t,i,n){this.View=t,this.initData=n,this.views=[],this.pool=new S(t,i,n),this.el=m(e),this.keySet=null!=i};D.prototype.update=function(e,t){void 0===e&&(e=[]);var n=this.keySet,o=this.views;this.pool.update(e,t);var r=this.pool,l=r.views,s=r.lookup;if(n)for(var u=0;u<o.length;u++){var a=o[u];null==s[a.__redom_id]&&(a.__redom_index=null,i(this,a))}for(var f=0;f<l.length;f++){l[f].__redom_index=f}x(this,l),n&&(this.lookup=s),this.views=l},D.extend=function(e,t,i,n){return D.bind(D,e,t,i,n)},A.extend=D.extend;var V=function(e,t){this.el=_(""),this.visible=!1,this.view=null,this._placeholder=this.el,e instanceof Node?this._el=e:e.el instanceof Node?(this._el=e,this.view=e):this._View=e,this._initData=t};V.prototype.update=function(e,t){var n=this._placeholder,o=this.el.parentNode;if(e){if(!this.visible)if(this._el)s(o,this._el,n),i(o,n),this.el=w(this._el),this.visible=e;else{var r=new(0,this._View)(this._initData);this.el=w(r),this.view=r,s(o,r,n),i(o,n)}this.view&&this.view.update&&this.view.update(t)}else if(this.visible){if(this._el)return s(o,n,this._el),i(o,this._el),this.el=n,void(this.visible=e);s(o,n,this.view),i(o,this.view),this.el=n,this.view=null}this.visible=e};var j=function(e,t,i){this.el=m(e),this.Views=t,this.initData=i};j.prototype.update=function(e,t){if(e!==this.route){var i=this.Views[e];this.route=e,i&&(i instanceof Node||i.el instanceof Node)?this.view=i:this.view=i&&new i(this.initData,t),x(this.el,[this.view])}this.view&&this.view.update&&this.view.update(t,e)};var C="http://www.w3.org/2000/svg";function E(e){for(var i,n=[],o=arguments.length-1;o-- >0;)n[o]=arguments[o+1];var r=typeof e;if("string"===r)i=t(e,C);else{if("function"!==r)throw new Error("At least one argument required");var l=e;i=new(Function.prototype.bind.apply(l,[null].concat(n)))}return p(w(i),n,!0),i}var T=E;E.extend=function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];return E.bind.apply(E,[this].concat(e))},E.ns=C,e.List=D,e.ListPool=S,e.Place=V,e.Router=j,e.el=b,e.h=N,e.html=g,e.list=A,e.listPool=function(e,t,i){return new S(e,t,i)},e.mount=s,e.place=function(e,t){return new V(e,t)},e.router=function(e,t,i){return new j(e,t,i)},e.s=T,e.setAttr=function(e,t,i){h(e,t,i)},e.setChildren=x,e.setData=c,e.setStyle=a,e.setXlink=v,e.svg=E,e.text=_,e.unmount=i,Object.defineProperty(e,"__esModule",{value:!0})}));
diff --git a/dist/treebird.css b/dist/treebird.css
index 5b74488..24b6014 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -14,12 +14,12 @@
 }
 
 
-*
+input
 {
     transition: .1s box-shadow;
 }
 
-*:focus
+input:focus
 {
     outline: 1px solid #aa0000;
     box-shadow: 0px 0px 6px #aa00006f;
@@ -309,7 +309,10 @@ table.ui-table td
     padding-bottom: unset;
     height: 26px;
     border-right: unset;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     padding-left: 27px;
+    box-shadow: unset;
     transition: width .1s ease;
     width: 180px;
 }
@@ -389,6 +392,8 @@ input[type=email],
 input[type=password]
 {
     padding: 2px;
+    border-radius: 3px;
+    box-shadow: 0px 2px 3px #00000005;
     border: 1px solid #d3d3d3;
 }
 
diff --git a/perl/main.pl b/perl/main.pl
index 274cb8f..4a41e56 100644
--- a/perl/main.pl
+++ b/perl/main.pl
@@ -16,11 +16,19 @@ use config;
 use embed;
 use meta;
 use login;
+
 # use Devel::Leak;
 
 # my $handle;
 # Devel::Leak::NoteSV($handle);
 
+# sub leaky_friend
+# {
+#     $count = Devel::Leak::CheckSV($handle);
+#     my $leakstr = "Memory: $count SVs\n";
+#     print STDERR $leakstr;
+# }
+
 sub base_page
 {
     my ($ssn,
@@ -49,10 +57,3 @@ sub base_page
 
     return $ret;
 }
-
-# sub leaky_friend
-# {
-#     $count = Devel::Leak::CheckSV($handle);
-#     my $leakstr = "Memory: $count SVs\n";
-#     print STDERR $leakstr;
-# }
diff --git a/templates/login.tt b/templates/login.tt
index 6b0cadb..77b4ac9 100644
--- a/templates/login.tt
+++ b/templates/login.tt
@@ -25,9 +25,9 @@
 
     <form action="/login/oauth" method="post">
         <div class="form-group">
-            <label for="instance-url">{{%s:instance_url}}: </label>
+            <label for="instance-url">[% lang('INSTANCE_URL') %]: </label>
             <input type="url" id="instance-url" name="instance">
-            <input class="btn btn-single" type="submit" value="{{%s:instance_submit}}">
+            <input class="btn btn-single" type="submit" value="[% lang('INSTANCE_SUBMIT') %]">
         </div>
     </form>
 </div>

From fe114a4995f66bd661c79d593826e98ec89b3ecb Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 14 Oct 2022 02:47:04 +0000
Subject: [PATCH 142/143] Fix JS

FossilOrigin-Name: 9d198513fc108e603d50e1f21082a5970f6996504c0541d54e376f9c98a6975c
---
 README.md           |   8 +-
 dist/js/main.js     | 570 ++++++++++++++++++++++----------------------
 dist/treebird.css   |   2 +-
 templates/main.tt   |   4 +-
 templates/status.tt |   2 +-
 5 files changed, 297 insertions(+), 289 deletions(-)

diff --git a/README.md b/README.md
index d672fe0..3ac5faf 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ The goal is to create a frontend that's lightweight enough to be viewed without
 usable enough to improve the experience with JS.
 
 Treebird uses C with FCGI, mastodont-c (library designed for Treebird, but can be used
-for other applications as well), and **optional** JavaScript for the frontend (100% functional without
-javascript, it only helps). Uses [RE:DOM](https://redom.js.org/) (3kb js library) to assist with DOM
-creation and native JS apis. (bundled, no need to build)
+for other applications as well), Perl, and **optional** JavaScript for the frontend (100% functional without
+javascript, it only helps). Uses [RE:DOM](https://redom.js.org/) (2kb JS library) to assist with DOM
+creation and native JS apis. (Already bundled)
 
 ## Why?
 
@@ -26,7 +26,7 @@ This led me to one choice, to develop my own frontend.
 
 Treebird respects compatibility with old browsers, and thus uses HTML table layouts, which are
 supported even by most modern terminal web browsers. The core browser we aim to at least maintain compatibility
-with is Netsurf, but most other browsers like GNU Emacs EWW, elinks, render Treebird wonderfully.
+with is Netsurf, but most other browsers like GNU Emacs EWW, elinks, render Treebird just alright.
 
 ## Credits
 
diff --git a/dist/js/main.js b/dist/js/main.js
index 1dd0b11..4014458 100644
--- a/dist/js/main.js
+++ b/dist/js/main.js
@@ -1,312 +1,318 @@
-(function(){
-    Element.prototype.insertAfter = function(element) {
-        element.parentNode.insertBefore(this, element.nextSibling);
+const { el, mount } = redom;
+
+'use strict';
+
+function get_cookie(cookiestr)
+{
+    return document.cookie
+        .split(';')
+        .find(row => row.startsWith(cookiestr+'='))
+        .split('=')[1];
+}
+
+// TODO Check if logged in .acct value is the same
+function reply_get_mentions(reply, content)
+{
+    const regexpr = /<a target="_parent" class="mention" href="https?:\/\/.*?\/@(.*?)@(.*?)">.*?<\/a>/g;
+    const arr = [...content.matchAll(regexpr)];
+    let res = reply ? `@${reply} ` : "";
+    const matches = content.matchAll(regexpr);
+
+    for (let x of matches)
+    {
+        res += `@${x[1]}@${x[2]} `;
+    }
+    return res;
+}
+
+
+function form_enter_submit(e, that)
+{
+    if ((e.ctrlKey || e.metaKey) && e.keyCode === 13)
+        that.closest('form').submit();
+}
+
+// Submit form entry on enter when in textbox/textarea
+document.querySelectorAll("input[type=text], input[type=url], input[type=email], input[type=password], textarea").forEach((i) => {
+    i.addEventListener("keydown", e => form_enter_submit(e, i));
+});
+
+function construct_query(query)
+{
+    let query_string = "";
+    let keys = Object.keys(query);
+    let vals = Object.values(query);
+    const len = keys.length;
+
+    for (let i = 0; i < keys.length; ++i)
+    {
+        query_string += keys[i] + "=" + vals[i];
+        if (i !== keys.length-1)
+            query_string += "&";
+    }
+    return query_string;
+}
+
+function send_request(url, query, type, cb, cb_args)
+{
+    let query_str = construct_query(query);
+    let xhr = new XMLHttpRequest();
+    xhr.open(type, url);
+    xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+    xhr.onreadystatechange = function() {
+        if (this.readyState === XMLHttpRequest.DONE)
+            cb(this, cb_args);
     };
+    xhr.send(query_str);
+    return xhr;
+}
 
-    function get_cookie(cookiestr)
-    {
-        return document.cookie
-            .split(';')
-            .find(row => row.startsWith(cookiestr+'='))
-            .split('=')[1];
-    }
+function upload_file(url, file_name, file, cb, cb_args, onprogress, onload)
+{
+    let xhr = new XMLHttpRequest();
+    let form_data = new FormData();
+    xhr.open("post", url);
+    form_data.append(file_name, file);
+    // xhr.setRequestHeader("Content-Type", "multipart/form-data");
+    xhr.onreadystatechange = function() {
+        if (this.readyState === XMLHttpRequest.DONE)
+            cb(this, cb_args);
+    };
+    xhr.upload.onprogress = onprogress;
+    xhr.upload.onload = onload;
+    xhr.send(form_data);
+    return xhr;
+}
 
-    // TODO Check if logged in .acct value is the same
-    function reply_get_mentions(reply, content)
-    {
-        const regexpr = /<a target="_parent" class="mention" href="https?:\/\/.*?\/@(.*?)@(.*?)">.*?<\/a>/g;
-        const arr = [...content.matchAll(regexpr)];
-        let res = reply ? `@${reply} ` : "";
-        const matches = content.matchAll(regexpr);
+function change_count_text(val, sum)
+{
+    if (val === "")
+        val = 0
+    else
+        val = parseInt(val);
+    val += sum;
+    return val > 0 ? val.toString() : "";
+}
 
-        for (let x of matches)
+function interact_action(status, type)
+{
+    let like = status.querySelector(".statbtn .like");
+    let repeat = status.querySelector(".statbtn .repeat");
+    
+    let svg;
+    if (type.value === "like" || type.value === "unlike")
+        svg = [ like ];
+    else if (type.value === "repeat" || type.value === "unrepeat")
+        svg = [ repeat ];
+    else if (type.value === "likeboost")
+        svg = [ like, repeat ];
+
+    if (svg)
+    svg.forEach(that => {
+        let label = that.parentNode;
+        let counter = label.querySelector(".count");
+        let is_interacted = label.classList.contains("interacted");
+
+        if (counter)
         {
-            res += `@${x[1]}@${x[2]} `;
+            counter.innerHTML = change_count_text(counter.innerHTML, is_interacted ? -1 : 1);
+        }
+        else {
+            // Nobody interacted with this yet, create counter
+            const counter = el("span.count", 1)
+            mount(label, counter);
+            is_interacted = false;
         }
-        return res;
-    }
 
-    function form_enter_submit(e, that)
-    {
-        if ((e.ctrlKey || e.metaKey) && e.keyCode === 13)
-            that.closest('form').submit();
-    }
-
-    // Submit form entry on enter when in textbox/textarea
-    document.querySelectorAll("input[type=text], input[type=url], input[type=email], input[type=password], textarea").forEach((i) => {
-        i.addEventListener("keydown", e => form_enter_submit(e, i));
+        if (is_interacted)
+        {
+            // Animation
+            that.classList.remove("interacted-anim");
+            label.classList.remove("interacted");
+            
+            // Flip itype value
+            type.value = type.value.replace("un", "");
+        }
+        else {
+            that.classList.add("interacted-anim");
+            label.classList.add("interacted");
+            type.value = "un" + type.value;
+        }
     });
-   
-    function construct_query(query)
+}
+
+function status_event(e)
+{
+    let target = e.target.closest(".statbtn");
+    if (target)
     {
-        query_string = "";
-        let keys = Object.keys(query);
-        let vals = Object.values(query);
-        const len = keys.length;
+        console.log('huh');
+        // Don't JS these
+        if (target.classList.contains("reply-btn") ||
+            target.classList.contains("view-btn") ||
+            target.classList.contains("statbtn-last"))
+            return true;
+        let type = target.parentNode.querySelector(".itype");
+        let status = e.target.closest(".status");
 
-        for (let i = 0; i < keys.length; ++i)
-        {
-            query_string += keys[i] + "=" + vals[i];
-            if (i !== keys.length-1)
-                query_string += "&";
-        }
-        return query_string;
-    }
-
-    function send_request(url, query, type, cb, cb_args)
-    {
-        let query_str = construct_query(query);
-        let xhr = new XMLHttpRequest();
-        xhr.open(type, url);
-        xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-        xhr.onreadystatechange = function() {
-            if (this.readyState === XMLHttpRequest.DONE)
-                cb(this, cb_args);
-        };
-        xhr.send(query_str);
-        return xhr;
-    }
-
-    function upload_file(url, file_name, file, cb, cb_args, onprogress, onload)
-    {
-        let xhr = new XMLHttpRequest();
-        let form_data = new FormData();
-        xhr.open("post", url);
-        form_data.append(file_name, file);
-        // xhr.setRequestHeader("Content-Type", "multipart/form-data");
-        xhr.onreadystatechange = function() {
-            if (this.readyState === XMLHttpRequest.DONE)
-                cb(this, cb_args);
-        };
-        xhr.upload.onprogress = onprogress;
-        xhr.upload.onload = onload;
-        xhr.send(form_data);
-        return xhr;
-    }
-
-    function change_count_text(val, sum)
-    {
-        if (val === "")
-            val = 0
-        else
-            val = parseInt(val);
-        val += sum;
-        return val > 0 ? val.toString() : "";
-    }
-
-    function interact_action(status, type)
-    {
-        let like = status.querySelector(".statbtn .like");
-        let repeat = status.querySelector(".statbtn .repeat");
-        
-        let svg;
-        if (type.value === "like" || type.value === "unlike")
-            svg = [ like ];
-        else if (type.value === "repeat" || type.value === "unrepeat")
-            svg = [ repeat ];
-        else if (type.value === "likeboost")
-            svg = [ like, repeat ];
-        
-        svg.forEach(that => {
-            let label = that.parentNode;
-            let counter = label.querySelector(".count");
-            
-            let is_active = that.classList.contains("active");
-            
-            that.classList.toggle("active");
-
-
-            if (is_active)
-            {
-                // Animation
-                that.classList.remove("active-anim");
-                
-                // Flip itype value
-                type.value = type.value.replace("un", "");
-            }
-            else {
-                that.classList.add("active-anim");
-                type.value = "un" + type.value;
-            }
-            
-            counter.innerHTML = change_count_text(counter.innerHTML, is_active ? -1 : 1);
-        });
-    }
-
-    function status_event(e)
-    {
-        let target = e.target.closest(".statbtn");
-        console.log(target);
-        if (target)
-        {
-            // Don't JS these
-            if (target.classList.contains("reply-btn") || target.classList.contains("view-btn"))
-                return true;
-            let type = target.parentNode.querySelector(".itype");
-            if (type === null)
-                return true;
-            let status = e.srcElement;
-
-            send_request("/treebird_api/v1/interact",
+        send_request("/treebird_api/v1/interact",
+                     {
+                         id: status.id,
+                         itype: type.value
+                     },
+                     "POST",
+                     (xhr, args) => {
+                         if (xhr.status !== 200)
                          {
-                             id: status.id,
-                             itype: type.value
-                         },
-                         "POST",
-                         (xhr, args) => {
-                             if (xhr.status !== 200)
-                             {
-                                 // Undo action if failure
-                                 interact_action(status, type);
-                             }
-                         }, null);
+                             // Undo action if failure
+                             interact_action(status, type);
+                         }
+                     }, null);
 
-            interact_action(status, type);
-            
-            e.preventDefault();
-            return false;
-        }
+        interact_action(status, type);
+        
         e.preventDefault();
+        return false;
     }
+}
 
-    function frame_resize()
+function frame_resize()
+{
+    let rightbar_frame = document.querySelector("#rightbar .sidebar-frame");
+    let rbar_frame_win = rightbar_frame.contentWindow;
+    rightbar_frame.height = rbar_frame_win.document.body.scrollHeight;
+}
+
+function filesize_to_str(bs)
+{
+    const val = bs === 0 ? 0 : Math.floor(Math.log(bs) / Math.log(1024));
+    return (bs / 1024**val).toFixed(1) * 1 + ['B', 'kB', 'MB', 'GB', 'TB'][val];
+}
+
+function html_encode(str)
+{
+    let en = document.createElement("span");
+    en.textContent = str;
+    return en.innerHTML;
+}
+
+function construct_file_upload(file, file_content)
+{
+    let container = document.createElement("div");
+    let content = document.createElement("img");
+    let info = document.createElement("span");
+    container.className = "file-upload";
+    
+    info.className = "upload-info";
+    info.innerHTML = `<span class="filesize">${filesize_to_str(file.size)}</span> &bull; <span class="filename">${html_encode(file.name)}</span>`;
+    let progress_div = document.createElement("div");
+    progress_div.className = "file-progress";
+    info.appendChild(progress_div);
+    
+    content.src = file_content;
+    content.className = "upload-content";
+    
+    container.appendChild(content);
+    container.appendChild(info);
+    return container;
+}
+
+function update_uploads_json(dom)
+{
+    let root = dom.parentNode;
+    let items = root.getElementsByClassName("file-upload");
+    let ids = [];
+
+    for (let i of items)
     {
-        let rightbar_frame = document.querySelector("#rightbar .sidebar-frame");
-        let rbar_frame_win = rightbar_frame.contentWindow;
-        rightbar_frame.height = rbar_frame_win.document.body.scrollHeight;
+        if (i.dataset.id)
+            ids.push(i.dataset.id);
     }
 
-    function filesize_to_str(bs)
+    // Goto statusbox
+    root = root.parentNode;
+    let file_ids = root.querySelector(".file-ids-json");
+    if (!file_ids)
     {
-        const val = bs === 0 ? 0 : Math.floor(Math.log(bs) / Math.log(1024));
-        return (bs / 1024**val).toFixed(1) * 1 + ['B', 'kB', 'MB', 'GB', 'TB'][val];
+        // Create if doesn't exist
+        file_ids = document.createElement("input");
+        file_ids.type = "hidden";
+        file_ids.className = "file-ids-json";
+        file_ids.name = "fileids";
+        root.appendChild(file_ids);
     }
 
-    function html_encode(str)
+    file_ids.value = JSON.stringify(ids);
+}
+
+function evt_file_upload(e)
+{
+    let target = e.target;
+    let file_upload_dom = this.closest("form").querySelector(".file-uploads-container");
+    file_upload_dom.className = "file-uploads-container";
+    const files = [...this.files];
+
+    let reader;
+
+    // Clear file input
+    this.value = '';
+
+    // Create file upload
+    for (let file of files)
     {
-        let en = document.createElement("span");
-        en.textContent = str;
-        return en.innerHTML;
-    }
+        reader = new FileReader();
+        reader.onload = (() => {
+            return (e) => {
+                let file_dom = construct_file_upload(file, e.target.result);
+                
+                file_upload_dom.appendChild(file_dom);
 
-    function construct_file_upload(file, file_content)
+                let xhr = upload_file("/treebird_api/v1/attachment",
+                                      "file",
+                                      file,
+                                      (xhr, args) => {
+                                          // TODO errors
+                                          file_dom.dataset.id = JSON.parse(xhr.response).id;
+                                          update_uploads_json(file_dom);
+                                      }, null,
+                                      (e) => {
+                                          let upload_file_progress = file_dom
+                                              .querySelector(".file-progress");
+                                          // Add offset of 3
+                                          upload_file_progress.style.width = 3+((e.loaded/e.total)*97);
+                                      },
+                                      (e) => {
+                                          file_dom.querySelector(".upload-content").style.opacity = "1.0";
+                                          file_dom.querySelector(".file-progress").remove();
+                                      });
+            }
+        })(file);
+        reader.readAsDataURL(file);
+
+    }
+}
+
+// Main (when loaded)
+document.addEventListener('DOMContentLoaded', () => {
+    let interact_btn = document.getElementsByClassName("status");
+
+    // Add event listener to add specificied buttons
+    for (let i = 0; i < interact_btn.length; ++i)
     {
-        let container = document.createElement("div");
-        let content = document.createElement("img");
-        let info = document.createElement("span");
-        container.className = "file-upload";
-        
-        info.className = "upload-info";
-        info.innerHTML = `<span class="filesize">${filesize_to_str(file.size)}</span> &bull; <span class="filename">${html_encode(file.name)}</span>`;
-        let progress_div = document.createElement("div");
-        progress_div.className = "file-progress";
-        info.appendChild(progress_div);
-        
-        content.src = file_content;
-        content.className = "upload-content";
-        
-        container.appendChild(content);
-        container.appendChild(info);
-        return container;
+        interact_btn[i].addEventListener('click', status_event);
     }
-
-    function update_uploads_json(dom)
+    
+    // Resize notifications iFrame to full height
+    let rightbar_frame = document.querySelector("#rightbar .sidebar-frame");
+    if (rightbar_frame)
     {
-        let root = dom.parentNode;
-        let items = root.getElementsByClassName("file-upload");
-        let ids = [];
-
-        for (let i of items)
-        {
-            if (i.dataset.id)
-                ids.push(i.dataset.id);
-        }
-
-        // Goto statusbox
-        root = root.parentNode;
-        let file_ids = root.querySelector(".file-ids-json");
-        if (!file_ids)
-        {
-            // Create if doesn't exist
-            file_ids = document.createElement("input");
-            file_ids.type = "hidden";
-            file_ids.className = "file-ids-json";
-            file_ids.name = "fileids";
-            root.appendChild(file_ids);
-        }
-
-        file_ids.value = JSON.stringify(ids);
+        rightbar_frame.contentWindow.addEventListener('DOMContentLoaded', frame_resize);
     }
 
-    function evt_file_upload(e)
+    // File upload
+    let file_inputs = document.querySelectorAll(".statusbox input[type=file]");
+    for (let file_input of file_inputs)
     {
-        let target = e.target;
-        let file_upload_dom = this.closest("form").querySelector(".file-uploads-container");
-        file_upload_dom.className = "file-uploads-container";
-        const files = [...this.files];
-
-        let reader;
-
-        // Clear file input
-        this.value = '';
-
-        // Create file upload
-        for (let file of files)
-        {
-            reader = new FileReader();
-            reader.onload = (() => {
-                return (e) => {
-                    let file_dom = construct_file_upload(file, e.target.result);
-                    
-                    file_upload_dom.appendChild(file_dom);
-
-                    let xhr = upload_file("/treebird_api/v1/attachment",
-                                          "file",
-                                          file,
-                                          (xhr, args) => {
-                                              // TODO errors
-                                              file_dom.dataset.id = JSON.parse(xhr.response).id;
-                                              update_uploads_json(file_dom);
-                                          }, null,
-                                          (e) => {
-                                              let upload_file_progress = file_dom
-                                                  .querySelector(".file-progress");
-                                              // Add offset of 3
-                                              upload_file_progress.style.width = 3+((e.loaded/e.total)*97);
-                                          },
-                                          (e) => {
-                                              file_dom.querySelector(".upload-content").style.opacity = "1.0";
-                                              file_dom.querySelector(".file-progress").remove();
-                                          });
-                }
-            })(file);
-            reader.readAsDataURL(file);
-
-        }
+        file_input.addEventListener('change', evt_file_upload);
     }
-
-    // Main (when loaded)
-    document.addEventListener('DOMContentLoaded', () => {
-        let interact_btn = document.getElementsByClassName("status");
-
-        // Add event listener to add specificied buttons
-        for (let i = 0; i < interact_btn.length; ++i)
-        {
-            interact_btn[i].addEventListener('click', status_event);
-        }
-        
-        // Resize notifications iFrame to full height
-        let rightbar_frame = document.querySelector("#rightbar .sidebar-frame");
-        if (rightbar_frame)
-        {
-            rightbar_frame.contentWindow.addEventListener('DOMContentLoaded', frame_resize);
-        }
-
-        // File upload
-        let file_inputs = document.querySelectorAll(".statusbox input[type=file]");
-        for (let file_input of file_inputs)
-        {
-            file_input.addEventListener('change', evt_file_upload);
-        }
-    });
-})();
+});
diff --git a/dist/treebird.css b/dist/treebird.css
index 24b6014..5d97caa 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -1894,7 +1894,7 @@ p}
     stroke: #303030;
 }
 
-.active-anim
+.interacted-anim
 {
     animation: interact .7s 1;
 }
diff --git a/templates/main.tt b/templates/main.tt
index 5fbaadf..2f1fcd9 100644
--- a/templates/main.tt
+++ b/templates/main.tt
@@ -207,7 +207,9 @@
                 </tr>
             </table>
         </div>
-        
+
+        <!-- Soy filled JS lib -->
+        <script src="$prefix/js/redom.min.js"></script>
         <!-- Source -->
         <script src="$prefix/js/main.js"></script>
         <script src="$prefix/js/emoji.js"></script>
diff --git a/templates/status.tt b/templates/status.tt
index f2654c3..5c77f3c 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -172,7 +172,7 @@
                                     </label>
                                 </form>
                             [% END %]
-                            <a target="_parent" class="statbtn statbtn-last" href="$prefix/status/[% status.id %]/react#[% status.id %]" class="pointer statbtn react-btn">
+                            <a target="_parent" class="statbtn pointer statbtn-last react-btn" href="$prefix/status/[% status.id %]/react#[% status.id %]">
                                 [% icon('emoji') %]
                             </a>
                             [% IF emoji_picker -%]

From 7e77b9566ae2d09e144f7ba49aebe5e64f8eda46 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Fri, 14 Oct 2022 13:35:22 +0000
Subject: [PATCH 143/143] Improve docs

FossilOrigin-Name: dd9f17a042796f045536f9586710038ec0ffdd759411ab9912e57cdfe17e2f56
---
 docs/INSTALL.md | 20 +++++++++++++++-----
 src/main.c      |  1 -
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index eb84be6..0309faa 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -8,23 +8,33 @@ For the following GNU/Linux distributions, you will need the following libraries
 
 ###### Debian
 
-`# apt install libcurl4-gnutls-dev libpcre2-dev libfcgi-dev base-devel`
+`# apt install libcurl4-gnutls-dev libpcre2-dev libfcgi-dev build-essential perl libperl-dev libtemplate-perl`
 
 ###### Void GNU/Linux
 
-`# xbps-install libcurl libcurl-devel base-devel pcre2 pcre2-devel fcgi fcgi-devel`
+`# xbps-install libcurl libcurl-devel base-devel pcre2 pcre2-devel fcgi fcgi-devel perl-Template-Toolkit`
 
 ###### Arch
 
-`# pacman -S curl base-devel`
+`# pacman -S curl base-devel perl perl-template-toolkit`
+
+###### Gentoo
+
+TODO
 
 Create a copy of `config.def.h` at `config.h`, edit the file with your information
 
-Run `make`. This will also clone mastodont-c, and compile both it and Treebird.
+Run `make`. (**hint:** Pass -j3 to speed up compilation). This will also clone mastodont-c, and compile both it and Treebird.
 
 If you `fossil update` any changes, `make update` should be run after updating
 
-## Perl dependencies
+## Perl dependencies manual install
+
+**Note:** You **WONT** need to do this if your distribution above included all the deps (Template Toolkit)
+
+At the moment, all of them listed above do, but if your distro is nonstandard, keep reading:
+
+---
 
 Treebird renders most of the content that you see in Perl using the Template Toolkit.
 
diff --git a/src/main.c b/src/main.c
index fdc1f90..adef162 100644
--- a/src/main.c
+++ b/src/main.c
@@ -208,7 +208,6 @@ static void* threaded_fcgi_start(void* arg)
         FCGX_Finish_r(&req);
     }
 
-
     return NULL;
 }
 #else