Multiple enhancements and bugfixes

!Breaking change! - The updated version will not be able to read your old database file

Major improvements:
- Added editable pastas
- Added private pastas
- Added line numbers
- Added support for wide mode (1080p instead of 720p)
- Added syntax highlighting support
- Added read-only mode
- Added built-in help page
- Added option to remove logo, change title and footer text

Minor improvements:
- Improved looks in pure html mode
- Removed link to GitHub repo from navbar
- Broke up 7km long main.rs file into smaller modules
- Moved water.css into a template instead of serving it as an external resource
- Made Save button a bit bigger
- Updated README.MD

Bugfixes:
- Fixed a bug where an incorrect animal ID in a request would cause a crash
- Fixed a bug where an empty or corrupt JSON database would cause a crash

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name="microbin"
-version="0.2.0"
+version="1.0.0"
 edition="2021"
 
 [dependencies]
@@ -21,3 +21,5 @@ log = "0.4"
 env_logger = "0.9.0"
 actix-web-httpauth = "0.6.0"
 lazy_static = "1.4.0"
+syntect = "5.0"
+

README.MD

@@ -2,24 +2,94 @@
 
 ![Screenshot](git/index.png)
 
-MicroBin is a super tiny and simple self hosted pastebin app written in Rust. The executable is around 6MB and it uses 2MB memory (plus your pastas, because they are all stored in the memory at the moment).
+MicroBin is a super tiny, feature rich, configurable, self-contained and self-hosted paste bin web application. It is very easy to set up and use, and will only require a few megabytes of memory and disk storage. It takes only a couple minutes to set it up, why not give it a try now?
 
 ### Features
 - Is very small
-- File uploads
-- Raw pasta content (/raw/[animals])
-- URL shortening and redirection
-- Automatic dark mode (follows system preferences)
-- Very simple database (json + files) for portability and easy backups
 - Animal names instead of random numbers for pasta identifiers (64 animals)
-- Automatically expiring pastas
+- File uploads (eg. server.com/file/pig-dog-cat)
-- Never expiring pastas
+- Raw pasta text (eg. server.com/raw/pig-dog-cat)
+- URL shortening and redirection
+- Very simple database (JSON + files) for portability, easy backups and integration
 - Listing and manually removing pastas (/pastalist)
+- Private and public pastas
+- Editable and final pastas
+- Never expiring pastas
+- Automatically expiring pastas
+- Syntax highlighting
+- Entirely self-contained executable, MicroBin is a single file!
+- Automatic dark mode (follows system preferences)
 - Very little CSS and absolutely no JS (see [water.css](https://github.com/kognise/water.css))
+- Most of the above can be toggled on and off!
+ 
+## 1 Usage
+
+### What is a "pasta" anyway?
+
+In microbin, a pasta can be:
+- A text that you want to paste from one machine to another, eg. some code,
+- A file that you want to share, eg. a video that is too large for Discord, a zip with a code project in it or an image,
+- A URL redirect.
+
+### When is MicroBin useful?
+
+You can use MicroBin
+- As a URL shortener/redirect service,
+- To send long texts to other people,
+- To send large files to other people,
+- To serve content on the web, eg. configuration files for testing, images, or any other file content using the Raw functionality,
+- To move files between your desktop and a server you access from the console,
+- As a "postbox" service where people can upload their files or texts, but they cannot see or remove what others sent you - just disable the pastalist page
+- To take notes! Simply create an editable pasta.
+
+...and many other things, why not get creative?
+
+### Creating a Pasta
+
+Navigate to the root of your server, for example https://microbin.myserver.com/. This should show you a form where you will at the very least see an expiration selector, a file attachment input, a content text field and a green save button. Depending on your configuration there miight also be a syntax highlight selector, an editable checkbox and a private ceckbox.
+
+Use the expiration dropdown to choose how long you want your pasta to exist. When the selected time has expired, it will be removed from the server. The content can be any text, including plain text, code, html, even a URL. A URL is a special case, because when you open the pasta again, it will redirect you to that URL instead of showing it as a text. Entering content is optional, and so is the file attachment. If you want, you can even submit a pasta completely empty.
+
+You will be redirected to the URL of the pasta, which will end with a few animal names. If you remember those animals, you can simply type them in on another machine and open your pasta elsewhere.
+
+If you have editable pastas enabled and you check the editable checkbox, then later on there will be an option to change the text content of your pasta. Selecting the private checkbox will simply prevent your pasta to show up on the pasta list page, if that is enabled.
+
+If you have syntax higlighting enabled, then select your language from the dropdown, or leave it as none if you just want to upload plain with no highlighting.
+
+### Listing Pastas
+
+If you have pasta listing enabled, then there is a pasta list option in the navigation bar, which will list all the pastas on the server in two groups: regular pastas and URL redirects (pastas containing nothing but a URL). If you have private pastas enabled, they will not show up here at all.
+
+From the pasta list page, you will be able to view individual pastas by clicking on their animal identifiers on the lest, view their raw contrent by clicking on the Raw button, remove them, and if you have editable pastas enabled, then open them in edit view.
+
+### Use MicroBin from the console with cURL
+
+Simple text Pasta: `curl -d "expiration=10min&content=This is a test pasta" -X POST https://microbin.myserver.com/create`
+
+File contents: `curl -d "expiration=10min&content=$( < mypastafile.txt )" -X POST https://microbin.myserver.com/create`
+
+Available expiration options:
+`1min`, `10min`, `1hour`, `24hour`, `1week`, `never`
+
+Use cURL to read the pasta: `curl https://microbin.myserver.com/rawpasta/fish-pony-crow`,
+
+or to download the pasta: `curl https://microbin.myserver.com/rawpasta/fish-pony-crow > output.txt` (use /file instead of /rawpasta to download attached file).
+
+## 2 Installation
+
+### Building MicroBin
 
-### Installation
 Simply clone the repository, build it with `cargo build --release` and run the `microbin` executable in the created `target/release/` directory. It will start on port 8080. You can change the port with `-p` or `--port` CL arguments. For other arguments see [the Wiki](https://github.com/szabodanika/microbin/wiki).
 
+```
+git clone https://github.com/szabodanika/microbin.git
+cd microbin
+cargo build --release
+./target/release/microbin -p 80
+```
+
+### MicroBin as a service
+
 To install it as a service on your Linux machine, create a file called `/etc/systemd/system/microbin.service`, paste this into it with the `[username]` and `[path to installation directory]` replaced with the actual values.
 
 ```
@@ -39,28 +109,140 @@ ExecStart=[path to installation directory]/target/release/microbin
 WantedBy=multi-user.target
 ```
 
-Then start the service with `systemctl start microbin` and enable it on boot with `systemctl enable microbin`.
+Here is my `microbin.service` for example, with some optional arguments:
-
-### Create Pasta with cURL
-
-Simple text Pasta: `curl -d "expiration=10min&content=This is a test pasta" -X POST https://microbin.myserver.com/create`
-
-File contents: `curl -d "expiration=10min&content=$( < mypastafile.txt )" -X POST https://microbin.myserver.com/create`
-
-Available expiration options:
-`1min`, `10min`, `1hour`, `24hour`, `1week`, `never`
-
-Use cURL to read the pasta: `curl https://microbin.myserver.com/rawpasta/fish-pony-crow`,
-
-or to download the pasta: `curl https://microbin.myserver.com/rawpasta/fish-pony-crow > output.txt` (use /file instead of /rawpasta to download attached file).
 
 
-### Needed improvements
+```
-- ~~Persisting pastas on disk (currently they are lost on restart)~~ (added on 2 May 2022)
+[Unit]
-- ~~Configuration with command line arguments (ports, enable-disable pasta list, footer, etc)~~  (added on 7 May 2022)
+Description=MicroBin
-- ~~File uploads~~ (added on 2 May 2022)
+After=network.target
-- ~~URL shortening~~ (added on 23 April 2022)
-- Removing pasta after N reads
-- CLI tool (beyond wget)
-- Better instructions and documentation - on GitHub and built in 
 
+[Service]
+Type=simple
+Restart=always
+User=ubuntu
+RootDirectory=/
+
+# This is the directory where I want to run microbin. It will store all the pastas here.
+WorkingDirectory=/home/ubuntu/server/microbin
+
+# This is the location of my executable - I also have 2 optional features enabled
+ExecStart=/home/ubuntu/server/microbin/target/release/microbin --editable --linenumbers --highlightsyntax
+
+# I keep my installation in the home directory, so I need to add this
+ProtectHome=off
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Then start the service with `systemctl start microbin` and enable it on boot with `systemctl enable microbin`. To update your MicroBin, simply update or clone the repository again, build it again, and then restart the service with `systemctl restart microbin`. An update will never affect your existing pastas, unless there is a breaking change in the data model (in which case MicroBin just won't be able to import your DB), which will always be mentioned explicitly.
+
+### NGINX configuration
+
+```
+server {
+	# I have HTTPS enabled using certbot - you can use HTTP of course if you want!
+  listen 443 ssl; # managed by Certbot
+
+	server_name	microbin.myserver.com;
+	
+	location / {
+			# Make sure to change the port if you are not running MicroBin at 8080!
+    	proxy_pass	        http://127.0.0.1:8080$request_uri;
+	    proxy_set_header	Host $host;
+	    proxy_set_header	X-Forwarded-Proto $scheme;
+	    proxy_set_header    X-Real-IP $remote_addr;
+	    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
+	}
+
+	# Limit content size - I have 1GB because my MicroBin server is private, no one else will use it.
+	client_max_body_size 1024M;
+	
+  ssl_certificate /etc/letsencrypt/live/microbin.myserver.com/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/microbin.myserver.com/privkey.pem; # managed by Certbot
+  include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+  ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+}
+
+```
+
+## 3 Command Line Arguments
+
+There is an ever expanding list of customisations built into MicroBin so you can use it the way you want. Instead of a configuration file, we simply use arguments that you pass to the executable, making the workflow even simpler. Read the following options and if you cannot find what you need, you can always open an issue at our GitHub repository and request a new feature!
+
+### --auth-username [AUTH_USERNAME]
+
+Require username for HTTP Basic Authentication when visiting the service. If `--auth-username` is set but `--auth-password ` is not, just leave the password field empty when logging in. You can also just go to https://username:password@yourserver.net or https://username@yourserver.net if password is not set instead of typing into the password
+
+### --auth-password [AUTH_PASSWORD]
+
+Require password for HTTP Basic Authentication when visiting the service. Will not have any affect unless `--auth-username` is also set. If `--auth-username` is set but `--auth-password ` is not, just leave the password field empty when logging in. You can also just go to https://username:password@yourserver.net or https://username@yourserver.net if password is not set instead of typing into the password prompt.
+
+### --editable
+
+Enables editable pastas. You will still be able to make finalised pastas but there will be an extra checkbox to make your new pasta editable from the pasta list or the pasta view page.
+
+### --footer_text [TEXT]
+
+Replaces the default footer text with your own. If you want to hide the footer, use --hide-footer instead.
+
+### -h, --help
+
+Show all commands in the terminal.
+
+### --hide-footer
+
+Hides the footer on every page.
+
+### --hide-header
+
+Hides the navigation bar on every page.
+
+### --hide-logo
+
+Hides the MicroBin logo from the navigation bar on every page.
+
+### --no-listing
+
+Disables the /pastalist endpoint, essentially making all pastas private.
+
+### --highlightsyntax
+
+Enables syntax highlighting support. When creating a new pasta, a new dropdown selector will be added where you can select your pasta's syntax, or just leave it empty for no highlighting.
+
+### -p, --port [PORT]
+
+Default value: 8080
+
+Sets the port for the server will be listening on.
+
+### --private
+
+Enables private pastas. Adds a new checkbox to make your pasta private, which then won't show up on the pastalist page. With the URL to your pasta, it will still be accessible.
+
+### --pure-html
+
+Disables main CSS styling, just uses a few in-line stylings for the layout. With this option you will lose dark-mode support.
+
+### --readonly
+
+Disables adding/editing/removing pastas entirely.
+
+### --title [TITLE]
+
+Replaces "MicroBin" with your title of choice in the navigation bar.
+
+### -t, --threads [THREADS]
+
+Default value: 1
+
+Number of workers MicroBin is allowed to have. Increase this to the number of CPU cores you have if you want to go beast mode, but for personal use one worker is enough.
+
+### -V, --version
+
+Displays your MicroBin's version information.
+
+### --wide
+
+Changes the maximum width of the UI from 720 pixels to 1080 pixels.

src/args.rs

@@ -0,0 +1,58 @@
+use clap::Parser;
+use lazy_static::lazy_static;
+
+lazy_static! {
+    pub static ref ARGS: Args = Args::parse();
+}
+
+#[derive(Parser, Debug, Clone)]
+#[clap(author, version, about, long_about = None)]
+pub struct Args {
+    #[clap(long)]
+    pub auth_username: Option<String>,
+
+    #[clap(long)]
+    pub auth_password: Option<String>,
+
+    #[clap(long)]
+    pub editable: bool,
+
+    #[clap(long)]
+    pub footer_text: Option<String>,
+
+    #[clap(long)]
+    pub hide_footer: bool,
+
+    #[clap(long)]
+    pub hide_header: bool,
+
+    #[clap(long)]
+    pub hide_logo: bool,
+
+    #[clap(long)]
+    pub no_listing: bool,
+
+    #[clap(long)]
+    pub highlightsyntax: bool,
+
+    #[clap(short, long, default_value_t = 8080)]
+    pub port: u32,
+
+    #[clap(long)]
+    pub private: bool,
+
+    #[clap(long)]
+    pub pure_html: bool,
+
+    #[clap(long)]
+    pub readonly: bool,
+
+    #[clap(long)]
+    pub title: Option<String>,
+
+    #[clap(short, long, default_value_t = 1)]
+    pub threads: u8,
+
+    #[clap(long)]
+    pub wide: bool,
+}

src/endpoints/create.rs

@@ -0,0 +1,142 @@
+use crate::dbio::save_to_file;
+use crate::util::animalnumbers::to_animal_names;
+use crate::util::misc::is_valid_url;
+use crate::{AppState, Pasta, ARGS};
+use actix_multipart::Multipart;
+use actix_web::{get, web, Error, HttpResponse, Responder};
+use askama::Template;
+use futures::TryStreamExt;
+use rand::Rng;
+use std::io::Write;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+#[derive(Template)]
+#[template(path = "index.html")]
+struct IndexTemplate<'a> {
+    args: &'a ARGS,
+}
+
+#[get("/")]
+pub async fn index() -> impl Responder {
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(IndexTemplate { args: &ARGS }.render().unwrap())
+}
+
+pub async fn create(
+    data: web::Data<AppState>,
+    mut payload: Multipart,
+) -> Result<HttpResponse, Error> {
+    if ARGS.readonly {
+        return Ok(HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish());
+    }
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let timenow: i64 = match SystemTime::now().duration_since(UNIX_EPOCH) {
+        Ok(n) => n.as_secs(),
+        Err(_) => {
+            log::error!("SystemTime before UNIX EPOCH!");
+            0
+        }
+    } as i64;
+
+    let mut new_pasta = Pasta {
+        id: rand::thread_rng().gen::<u16>() as u64,
+        content: String::from("No Text Content"),
+        file: String::from("no-file"),
+        extension: String::from(""),
+        private: false,
+        editable: false,
+        created: timenow,
+        pasta_type: String::from(""),
+        expiration: 0,
+    };
+
+    while let Some(mut field) = payload.try_next().await? {
+        match field.name() {
+            "editable" => {
+                // while let Some(_chunk) = field.try_next().await? {}
+                new_pasta.editable = true;
+                continue;
+            }
+            "private" => {
+                // while let Some(_chunk) = field.try_next().await? {}
+                new_pasta.private = true;
+                continue;
+            }
+            "expiration" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_pasta.expiration = match std::str::from_utf8(&chunk).unwrap() {
+                        "1min" => timenow + 60,
+                        "10min" => timenow + 60 * 10,
+                        "1hour" => timenow + 60 * 60,
+                        "24hour" => timenow + 60 * 60 * 24,
+                        "1week" => timenow + 60 * 60 * 24 * 7,
+                        "never" => 0,
+                        _ => {
+                            log::error!("{}", "Unexpected expiration time!");
+                            0
+                        }
+                    };
+                }
+
+                continue;
+            }
+            "content" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_pasta.content = std::str::from_utf8(&chunk).unwrap().to_string();
+                    new_pasta.pasta_type = if is_valid_url(new_pasta.content.as_str()) {
+                        String::from("url")
+                    } else {
+                        String::from("text")
+                    };
+                }
+                continue;
+            }
+            "syntax-highlight" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_pasta.extension = std::str::from_utf8(&chunk).unwrap().to_string();
+                }
+                continue;
+            }
+            "file" => {
+                let content_disposition = field.content_disposition();
+
+                let filename = match content_disposition.get_filename() {
+                    Some("") => continue,
+                    Some(filename) => filename.replace(' ', "_").to_string(),
+                    None => continue,
+                };
+
+                std::fs::create_dir_all(format!("./pasta_data/{}", &new_pasta.id_as_animals()))
+                    .unwrap();
+
+                let filepath = format!("./pasta_data/{}/{}", &new_pasta.id_as_animals(), &filename);
+
+                new_pasta.file = filename;
+
+                let mut f = web::block(|| std::fs::File::create(filepath)).await??;
+
+                while let Some(chunk) = field.try_next().await? {
+                    f = web::block(move || f.write_all(&chunk).map(|_| f)).await??;
+                }
+
+                new_pasta.pasta_type = String::from("text");
+            }
+            _ => {}
+        }
+    }
+
+    let id = new_pasta.id;
+
+    pastas.push(new_pasta);
+
+    save_to_file(&pastas);
+
+    Ok(HttpResponse::Found()
+        .append_header(("Location", format!("/pasta/{}", to_animal_names(id))))
+        .finish())
+}

src/endpoints/edit.rs

@@ -0,0 +1,99 @@
+use crate::args::Args;
+use crate::dbio::save_to_file;
+use crate::endpoints::errors::ErrorTemplate;
+use crate::util::animalnumbers::to_u64;
+use crate::util::misc::remove_expired;
+use crate::{AppState, Pasta, ARGS};
+use actix_multipart::Multipart;
+use actix_web::{get, post, web, Error, HttpResponse};
+use askama::Template;
+use futures::TryStreamExt;
+
+#[derive(Template)]
+#[template(path = "edit.html", escape = "none")]
+struct EditTemplate<'a> {
+    pasta: &'a Pasta,
+    args: &'a Args,
+}
+
+#[get("/edit/{id}")]
+pub async fn get_edit(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            if !pasta.editable {
+                return HttpResponse::Found()
+                    .append_header(("Location", "/"))
+                    .finish();
+            }
+            return HttpResponse::Found().content_type("text/html").body(
+                EditTemplate {
+                    pasta: &pasta,
+                    args: &ARGS,
+                }
+                .render()
+                .unwrap(),
+            );
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}
+
+#[post("/edit/{id}")]
+pub async fn post_edit(
+    data: web::Data<AppState>,
+    id: web::Path<String>,
+    mut payload: Multipart,
+) -> Result<HttpResponse, Error> {
+    if ARGS.readonly {
+        return Ok(HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish());
+    }
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    remove_expired(&mut pastas);
+
+    let mut new_content = String::from("");
+
+    while let Some(mut field) = payload.try_next().await? {
+        match field.name() {
+            "content" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_content = std::str::from_utf8(&chunk).unwrap().to_string();
+                }
+            }
+            _ => {}
+        }
+    }
+
+    for (i, pasta) in pastas.iter().enumerate() {
+        if pasta.id == id {
+            if pasta.editable {
+                pastas[i].content.replace_range(.., &*new_content);
+                save_to_file(&pastas);
+
+                return Ok(HttpResponse::Found()
+                    .append_header(("Location", format!("/pasta/{}", pastas[i].id_as_animals())))
+                    .finish());
+            } else {
+                break;
+            }
+        }
+    }
+
+    Ok(HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap()))
+}

src/endpoints/errors.rs

@@ -0,0 +1,16 @@
+use actix_web::{Error, HttpResponse};
+use askama::Template;
+
+use crate::args::{Args, ARGS};
+
+#[derive(Template)]
+#[template(path = "error.html")]
+pub struct ErrorTemplate<'a> {
+    pub args: &'a Args,
+}
+
+pub async fn not_found() -> Result<HttpResponse, Error> {
+    Ok(HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap()))
+}

src/endpoints/help.rs

@@ -0,0 +1,23 @@
+use crate::args::{Args, ARGS};
+use actix_web::{get, HttpResponse};
+use askama::Template;
+use std::marker::PhantomData;
+
+#[derive(Template)]
+#[template(path = "help.html")]
+struct Help<'a> {
+    args: &'a Args,
+    _marker: PhantomData<&'a ()>,
+}
+
+#[get("/help")]
+pub async fn help() -> HttpResponse {
+    HttpResponse::Found().content_type("text/html").body(
+        Help {
+            args: &ARGS,
+            _marker: Default::default(),
+        }
+        .render()
+        .unwrap(),
+    )
+}

src/endpoints/pasta.rs

@@ -0,0 +1,88 @@
+use actix_web::{get, web, HttpResponse};
+use askama::Template;
+
+use crate::args::{Args, ARGS};
+use crate::endpoints::errors::ErrorTemplate;
+use crate::pasta::Pasta;
+use crate::util::animalnumbers::to_u64;
+use crate::util::misc::remove_expired;
+use crate::AppState;
+
+#[derive(Template)]
+#[template(path = "pasta.html", escape = "none")]
+struct PastaTemplate<'a> {
+    pasta: &'a Pasta,
+    args: &'a Args,
+}
+
+#[get("/pasta/{id}")]
+pub async fn getpasta(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    println!("{}", id);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            return HttpResponse::Found().content_type("text/html").body(
+                PastaTemplate {
+                    pasta: &pasta,
+                    args: &ARGS,
+                }
+                .render()
+                .unwrap(),
+            );
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}
+
+#[get("/url/{id}")]
+pub async fn redirecturl(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            if pasta.pasta_type == "url" {
+                return HttpResponse::Found()
+                    .append_header(("Location", String::from(&pasta.content)))
+                    .finish();
+            } else {
+                return HttpResponse::Found()
+                    .content_type("text/html")
+                    .body(ErrorTemplate { args: &ARGS }.render().unwrap());
+            }
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}
+
+#[get("/raw/{id}")]
+pub async fn getrawpasta(data: web::Data<AppState>, id: web::Path<String>) -> String {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            return pasta.content.to_owned();
+        }
+    }
+
+    String::from("Pasta not found! :-(")
+}

src/endpoints/pastalist.rs

@@ -0,0 +1,38 @@
+use actix_web::{get, web, HttpResponse};
+use askama::Template;
+
+use crate::args::{Args, ARGS};
+use crate::pasta::Pasta;
+use crate::util::misc::remove_expired;
+use crate::AppState;
+
+#[derive(Template)]
+#[template(path = "pastalist.html")]
+struct PastaListTemplate<'a> {
+    pastas: &'a Vec<Pasta>,
+    args: &'a Args,
+}
+
+#[get("/pastalist")]
+pub async fn list(data: web::Data<AppState>) -> HttpResponse {
+    if ARGS.no_listing {
+        return HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish();
+    }
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    pastas.retain(|p| !p.private);
+
+    remove_expired(&mut pastas);
+
+    HttpResponse::Found().content_type("text/html").body(
+        PastaListTemplate {
+            pastas: &pastas,
+            args: &ARGS,
+        }
+        .render()
+        .unwrap(),
+    )
+}

src/endpoints/remove.rs

@@ -0,0 +1,36 @@
+use actix_web::{get, web, HttpResponse};
+
+use crate::args::ARGS;
+use crate::endpoints::errors::ErrorTemplate;
+use crate::util::animalnumbers::to_u64;
+use crate::util::misc::remove_expired;
+use crate::AppState;
+use askama::Template;
+
+#[get("/remove/{id}")]
+pub async fn remove(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    if ARGS.readonly {
+        return HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish();
+    }
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for (i, pasta) in pastas.iter().enumerate() {
+        if pasta.id == id {
+            pastas.remove(i);
+            return HttpResponse::Found()
+                .append_header(("Location", "/pastalist"))
+                .finish();
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}

src/endpoints/static_resources.rs

@@ -0,0 +1,23 @@
+use actix_web::{get, web, HttpResponse};
+use askama::Template;
+use std::marker::PhantomData;
+
+#[derive(Template)]
+#[template(path = "water.css", escape = "none")]
+struct WaterCSS<'a> {
+    _marker: PhantomData<&'a ()>,
+}
+
+#[get("/static/{resource}")]
+pub async fn static_resources(resource_id: web::Path<String>) -> HttpResponse {
+    match resource_id.into_inner().as_str() {
+        "water.css" => HttpResponse::Found().content_type("text/html").body(
+            WaterCSS {
+                _marker: Default::default(),
+            }
+            .render()
+            .unwrap(),
+        ),
+        _ => HttpResponse::NotFound().content_type("text/html").finish(),
+    }
+}

src/main.rs

@@ -1,331 +1,49 @@
 extern crate core;
 
+use crate::args::ARGS;
+use crate::endpoints::{
+    create, edit, errors, help, pasta as pasta_endpoint, pastalist, remove, static_resources,
+};
+use crate::pasta::Pasta;
+use crate::util::dbio;
+use actix_web::middleware::Condition;
+use actix_web::{middleware, web, App, HttpServer};
+use actix_web_httpauth::middleware::HttpAuthentication;
+use chrono::Local;
 use env_logger::Builder;
+use log::LevelFilter;
+use std::fs;
 use std::io::Write;
 use std::sync::Mutex;
-use std::time::{SystemTime, UNIX_EPOCH};
 
-use actix_files;
+pub mod args;
-use actix_multipart::Multipart;
+pub mod pasta;
-use actix_web::dev::ServiceRequest;
-use actix_web::middleware::Condition;
-use actix_web::{error, get, middleware, web, App, Error, HttpResponse, HttpServer, Responder};
-use actix_web_httpauth::extractors::basic::BasicAuth;
-use actix_web_httpauth::middleware::HttpAuthentication;
-use askama::Template;
-use chrono::Local;
-use clap::Parser;
-use futures::TryStreamExt as _;
-use lazy_static::lazy_static;
-use linkify::{LinkFinder, LinkKind};
-use log::LevelFilter;
-use rand::Rng;
-use std::fs;
 
-use crate::animalnumbers::{to_animal_names, to_u64};
+pub mod util {
-use crate::dbio::save_to_file;
+    pub mod animalnumbers;
-use crate::pasta::Pasta;
+    pub mod auth;
-
+    pub mod dbio;
-mod animalnumbers;
+    pub mod misc;
-mod dbio;
+    pub mod syntaxhighlighter;
-mod pasta;
-
-lazy_static! {
-    static ref ARGS: Args = Args::parse();
 }
 
-struct AppState {
+pub mod endpoints {
-    pastas: Mutex<Vec<Pasta>>,
+    pub mod create;
+    pub mod edit;
+    pub mod errors;
+    pub mod help;
+    pub mod pasta;
+    pub mod pastalist;
+    pub mod remove;
+    pub mod static_resources;
 }
 
-#[derive(Parser, Debug, Clone)]
+pub struct AppState {
-#[clap(author, version, about, long_about = None)]
+    pub pastas: Mutex<Vec<Pasta>>,
-struct Args {
-    #[clap(short, long, default_value_t = 8080)]
-    port: u32,
-
-    #[clap(short, long, default_value_t = 1)]
-    threads: u8,
-
-    #[clap(long)]
-    hide_header: bool,
-
-    #[clap(long)]
-    hide_footer: bool,
-
-    #[clap(long)]
-    pure_html: bool,
-
-    #[clap(long)]
-    no_listing: bool,
-
-    #[clap(long)]
-    auth_username: Option<String>,
-
-    #[clap(long)]
-    auth_password: Option<String>,
-}
-
-async fn auth_validator(
-    req: ServiceRequest,
-    credentials: BasicAuth,
-) -> Result<ServiceRequest, Error> {
-    // check if username matches
-    if credentials.user_id().as_ref() == ARGS.auth_username.as_ref().unwrap() {
-        return match ARGS.auth_password.as_ref() {
-            Some(cred_pass) => match credentials.password() {
-                None => Err(error::ErrorBadRequest("Invalid login details.")),
-                Some(arg_pass) => {
-                    if arg_pass == cred_pass {
-                        Ok(req)
-                    } else {
-                        Err(error::ErrorBadRequest("Invalid login details."))
-                    }
-                }
-            },
-            None => Ok(req),
-        };
-    } else {
-        Err(error::ErrorBadRequest("Invalid login details."))
-    }
-}
-
-#[derive(Template)]
-#[template(path = "index.html")]
-struct IndexTemplate<'a> {
-    args: &'a Args,
-}
-
-#[derive(Template)]
-#[template(path = "error.html")]
-struct ErrorTemplate<'a> {
-    args: &'a Args,
-}
-
-#[derive(Template)]
-#[template(path = "pasta.html")]
-struct PastaTemplate<'a> {
-    pasta: &'a Pasta,
-    args: &'a Args,
-}
-
-#[derive(Template)]
-#[template(path = "pastalist.html")]
-struct PastaListTemplate<'a> {
-    pastas: &'a Vec<Pasta>,
-    args: &'a Args,
-}
-
-#[get("/")]
-async fn index() -> impl Responder {
-    HttpResponse::Found()
-        .content_type("text/html")
-        .body(IndexTemplate { args: &ARGS }.render().unwrap())
-}
-
-async fn not_found() -> Result<HttpResponse, Error> {
-    Ok(HttpResponse::Found()
-        .content_type("text/html")
-        .body(ErrorTemplate { args: &ARGS }.render().unwrap()))
-}
-
-async fn create(data: web::Data<AppState>, mut payload: Multipart) -> Result<HttpResponse, Error> {
-    let mut pastas = data.pastas.lock().unwrap();
-
-    let timenow: i64 = match SystemTime::now().duration_since(UNIX_EPOCH) {
-        Ok(n) => n.as_secs(),
-        Err(_) => panic!("SystemTime before UNIX EPOCH!"),
-    } as i64;
-
-    let mut new_pasta = Pasta {
-        id: rand::thread_rng().gen::<u16>() as u64,
-        content: String::from("No Text Content"),
-        file: String::from("no-file"),
-        created: timenow,
-        pasta_type: String::from(""),
-        expiration: 0,
-    };
-
-    while let Some(mut field) = payload.try_next().await? {
-        match field.name() {
-            "expiration" => {
-                while let Some(chunk) = field.try_next().await? {
-                    new_pasta.expiration = match std::str::from_utf8(&chunk).unwrap() {
-                        "1min" => timenow + 60,
-                        "10min" => timenow + 60 * 10,
-                        "1hour" => timenow + 60 * 60,
-                        "24hour" => timenow + 60 * 60 * 24,
-                        "1week" => timenow + 60 * 60 * 24 * 7,
-                        "never" => 0,
-                        _ => panic!("Unexpected expiration time!"),
-                    };
-                }
-
-                continue;
-            }
-            "content" => {
-                while let Some(chunk) = field.try_next().await? {
-                    new_pasta.content = std::str::from_utf8(&chunk).unwrap().to_string();
-                    new_pasta.pasta_type = if is_valid_url(new_pasta.content.as_str()) {
-                        String::from("url")
-                    } else {
-                        String::from("text")
-                    };
-                }
-                continue;
-            }
-            "file" => {
-                let content_disposition = field.content_disposition();
-
-                let filename = match content_disposition.get_filename() {
-                    Some("") => continue,
-                    Some(filename) => filename.replace(' ', "_").to_string(),
-                    None => continue,
-                };
-
-                std::fs::create_dir_all(format!("./pasta_data/{}", &new_pasta.id_as_animals()))
-                    .unwrap();
-
-                let filepath = format!("./pasta_data/{}/{}", &new_pasta.id_as_animals(), &filename);
-
-                new_pasta.file = filename;
-
-                let mut f = web::block(|| std::fs::File::create(filepath)).await??;
-
-                while let Some(chunk) = field.try_next().await? {
-                    f = web::block(move || f.write_all(&chunk).map(|_| f)).await??;
-                }
-
-                new_pasta.pasta_type = String::from("text");
-            }
-            _ => {}
-        }
-    }
-
-    let id = new_pasta.id;
-
-    pastas.push(new_pasta);
-
-    save_to_file(&pastas);
-
-    Ok(HttpResponse::Found()
-        .append_header(("Location", format!("/pasta/{}", to_animal_names(id))))
-        .finish())
-}
-
-#[get("/pasta/{id}")]
-async fn getpasta(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
-    let mut pastas = data.pastas.lock().unwrap();
-
-    let id = to_u64(&*id.into_inner());
-
-    remove_expired(&mut pastas);
-
-    for pasta in pastas.iter() {
-        if pasta.id == id {
-            return HttpResponse::Found()
-                .content_type("text/html")
-                .body(PastaTemplate { pasta, args: &ARGS }.render().unwrap());
-        }
-    }
-
-    HttpResponse::Found()
-        .content_type("text/html")
-        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
-}
-
-#[get("/url/{id}")]
-async fn redirecturl(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
-    let mut pastas = data.pastas.lock().unwrap();
-
-    let id = to_u64(&*id.into_inner());
-
-    remove_expired(&mut pastas);
-
-    for pasta in pastas.iter() {
-        if pasta.id == id {
-            if pasta.pasta_type == "url" {
-                return HttpResponse::Found()
-                    .append_header(("Location", String::from(&pasta.content)))
-                    .finish();
-            } else {
-                return HttpResponse::Found()
-                    .content_type("text/html")
-                    .body(ErrorTemplate { args: &ARGS }.render().unwrap());
-            }
-        }
-    }
-
-    HttpResponse::Found()
-        .content_type("text/html")
-        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
-}
-
-#[get("/raw/{id}")]
-async fn getrawpasta(data: web::Data<AppState>, id: web::Path<String>) -> String {
-    let mut pastas = data.pastas.lock().unwrap();
-
-    let id = to_u64(&*id.into_inner());
-
-    remove_expired(&mut pastas);
-
-    for pasta in pastas.iter() {
-        if pasta.id == id {
-            return pasta.content.to_owned();
-        }
-    }
-
-    String::from("Pasta not found! :-(")
-}
-
-#[get("/remove/{id}")]
-async fn remove(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
-    let mut pastas = data.pastas.lock().unwrap();
-
-    let id = to_u64(&*id.into_inner());
-
-    remove_expired(&mut pastas);
-
-    for (i, pasta) in pastas.iter().enumerate() {
-        if pasta.id == id {
-            pastas.remove(i);
-            return HttpResponse::Found()
-                .append_header(("Location", "/pastalist"))
-                .finish();
-        }
-    }
-
-    HttpResponse::Found()
-        .content_type("text/html")
-        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
-}
-
-#[get("/pastalist")]
-async fn list(data: web::Data<AppState>) -> HttpResponse {
-    if ARGS.no_listing {
-        return HttpResponse::Found()
-            .append_header(("Location", "/"))
-            .finish();
-    }
-
-    let mut pastas = data.pastas.lock().unwrap();
-
-    remove_expired(&mut pastas);
-
-    HttpResponse::Found().content_type("text/html").body(
-        PastaListTemplate {
-            pastas: &pastas,
-            args: &ARGS,
-        }
-        .render()
-        .unwrap(),
-    )
 }
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    let args: Args = Args::parse();
-
     Builder::new()
         .format(|buf, record| {
             writeln!(
@@ -341,10 +59,10 @@ async fn main() -> std::io::Result<()> {
 
     log::info!(
         "MicroBin starting on http://127.0.0.1:{}",
-        args.port.to_string()
+        ARGS.port.to_string()
     );
 
-    match std::fs::create_dir_all("./pasta_data") {
+    match fs::create_dir_all("./pasta_data") {
         Ok(dir) => dir,
         Err(error) => {
             log::error!("Couldn't create data directory ./pasta_data: {:?}", error);
@@ -360,53 +78,27 @@ async fn main() -> std::io::Result<()> {
         App::new()
             .app_data(data.clone())
             .wrap(middleware::NormalizePath::trim())
-            .service(index)
+            .service(create::index)
-            .service(getpasta)
+            .service(help::help)
-            .service(redirecturl)
+            .service(pasta_endpoint::getpasta)
-            .service(getrawpasta)
+            .service(pasta_endpoint::getrawpasta)
-            .service(actix_files::Files::new("/static", "./static"))
+            .service(pasta_endpoint::redirecturl)
+            .service(edit::get_edit)
+            .service(edit::post_edit)
+            .service(static_resources::static_resources)
             .service(actix_files::Files::new("/file", "./pasta_data"))
-            .service(web::resource("/upload").route(web::post().to(create)))
+            .service(web::resource("/upload").route(web::post().to(create::create)))
-            .default_service(web::route().to(not_found))
+            .default_service(web::route().to(errors::not_found))
             .wrap(middleware::Logger::default())
-            .service(remove)
+            .service(remove::remove)
-            .service(list)
+            .service(pastalist::list)
             .wrap(Condition::new(
-                args.auth_username.is_some(),
+                ARGS.auth_username.is_some(),
-                HttpAuthentication::basic(auth_validator),
+                HttpAuthentication::basic(util::auth::auth_validator),
             ))
     })
-    .bind(format!("0.0.0.0:{}", args.port.to_string()))?
+    .bind(format!("0.0.0.0:{}", ARGS.port.to_string()))?
-    .workers(args.threads as usize)
+    .workers(ARGS.threads as usize)
     .run()
     .await
 }
-
-fn remove_expired(pastas: &mut Vec<Pasta>) {
-    // get current time - this will be needed to check which pastas have expired
-    let timenow: i64 = match SystemTime::now().duration_since(UNIX_EPOCH) {
-        Ok(n) => n.as_secs(),
-        Err(_) => panic!("SystemTime before UNIX EPOCH!"),
-    } as i64;
-
-    pastas.retain(|p| {
-        // expiration is `never` or not reached
-        if p.expiration == 0 || p.expiration > timenow {
-            // keep
-            true
-        } else {
-            // remove the file itself
-            fs::remove_file(format!("./pasta_data/{}/{}", p.id_as_animals(), p.file));
-            // and remove the containing directory
-            fs::remove_dir(format!("./pasta_data/{}/", p.id_as_animals()));
-            // remove
-            false
-        }
-    });
-}
-
-fn is_valid_url(url: &str) -> bool {
-    let finder = LinkFinder::new();
-    let spans: Vec<_> = finder.spans(url).collect();
-    spans[0].as_str() == url && Some(&LinkKind::Url) == spans[0].kind()
-}

src/pasta.rs

@@ -3,13 +3,17 @@ use std::fmt;
 use chrono::{DateTime, Datelike, NaiveDateTime, Timelike, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::to_animal_names;
+use crate::util::animalnumbers::to_animal_names;
+use crate::util::syntaxhighlighter::html_highlight;
 
 #[derive(Serialize, Deserialize)]
 pub struct Pasta {
     pub id: u64,
     pub content: String,
     pub file: String,
+    pub extension: String,
+    pub private: bool,
+    pub editable: bool,
     pub created: i64,
     pub expiration: i64,
     pub pasta_type: String,
@@ -46,6 +50,14 @@ impl Pasta {
             )
         }
     }
+
+    pub fn content_syntax_highlighted(&self) -> String {
+        html_highlight(&self.content, &self.extension)
+    }
+
+    pub fn content_not_highlighted(&self) -> String {
+        html_highlight(&self.content, "txt")
+    }
 }
 
 impl fmt::Display for Pasta {

src/util/animalnumbers.rs

@@ -14,8 +14,8 @@ pub fn to_animal_names(mut number: u64) -> String {
         return ANIMAL_NAMES[0].parse().unwrap();
     }
 
-    // max 4 animals so 6 * 6 = 64 bits
     let mut power = 6;
+
     loop {
         let digit = number / ANIMAL_NAMES.len().pow(power) as u64;
         if !(result.is_empty() && digit == 0) {
@@ -32,7 +32,7 @@ pub fn to_animal_names(mut number: u64) -> String {
     result.join("-")
 }
 
-pub fn to_u64(animal_names: &str) -> u64 {
+pub fn to_u64(animal_names: &str) -> Result<u64, &str> {
     let mut result: u64 = 0;
 
     let animals: Vec<&str> = animal_names.split("-").collect();
@@ -40,9 +40,14 @@ pub fn to_u64(animal_names: &str) -> u64 {
     let mut pow = animals.len();
     for i in 0..animals.len() {
         pow -= 1;
-        result += (ANIMAL_NAMES.iter().position(|&r| r == animals[i]).unwrap()
+        let animal_index = ANIMAL_NAMES.iter().position(|&r| r == animals[i]);
-            * ANIMAL_NAMES.len().pow(pow as u32)) as u64;
+        match animal_index {
+            None => return Err("Failed to convert animal name to u64!"),
+            Some(_) => {
+                result += (animal_index.unwrap() * ANIMAL_NAMES.len().pow(pow as u32)) as u64
+            }
+        }
     }
 
-    result
+    Ok(result)
 }

src/util/auth.rs

@@ -0,0 +1,29 @@
+use actix_web::dev::ServiceRequest;
+use actix_web::{error, Error};
+use actix_web_httpauth::extractors::basic::BasicAuth;
+
+use crate::args::ARGS;
+
+pub async fn auth_validator(
+    req: ServiceRequest,
+    credentials: BasicAuth,
+) -> Result<ServiceRequest, Error> {
+    // check if username matches
+    if credentials.user_id().as_ref() == ARGS.auth_username.as_ref().unwrap() {
+        return match ARGS.auth_password.as_ref() {
+            Some(cred_pass) => match credentials.password() {
+                None => Err(error::ErrorBadRequest("Invalid login details.")),
+                Some(arg_pass) => {
+                    if arg_pass == cred_pass {
+                        Ok(req)
+                    } else {
+                        Err(error::ErrorBadRequest("Invalid login details."))
+                    }
+                }
+            },
+            None => Ok(req),
+        };
+    } else {
+        Err(error::ErrorBadRequest("Invalid login details."))
+    }
+}

src/util/dbio.rs

@@ -39,7 +39,10 @@ pub fn load_from_file() -> io::Result<Vec<Pasta>> {
     match file {
         Ok(_) => {
             let reader = BufReader::new(file.unwrap());
-            let data: Vec<Pasta> = serde_json::from_reader(reader).unwrap();
+            let data: Vec<Pasta> = match serde_json::from_reader(reader) {
+                Ok(t) => t,
+                _ => Vec::new(),
+            };
             Ok(data)
         }
         Err(_) => {

src/util/misc.rs

@@ -0,0 +1,42 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use linkify::{LinkFinder, LinkKind};
+use std::fs;
+
+use crate::Pasta;
+
+pub fn remove_expired(pastas: &mut Vec<Pasta>) {
+    // get current time - this will be needed to check which pastas have expired
+    let timenow: i64 = match SystemTime::now().duration_since(UNIX_EPOCH) {
+        Ok(n) => n.as_secs(),
+        Err(_) => {
+            log::error!("SystemTime before UNIX EPOCH!");
+            0
+        }
+    } as i64;
+
+    pastas.retain(|p| {
+        // expiration is `never` or not reached
+        if p.expiration == 0 || p.expiration > timenow {
+            // keep
+            true
+        } else {
+            // remove the file itself
+            fs::remove_file(format!("./pasta_data/{}/{}", p.id_as_animals(), p.file))
+                .expect(&*format!("Failed to delete file {}!", p.file));
+            // and remove the containing directory
+            fs::remove_dir(format!("./pasta_data/{}/", p.id_as_animals())).expect(&*format!(
+                "Failed to delete directory {}!",
+                p.id_as_animals()
+            ));
+            // remove
+            false
+        }
+    });
+}
+
+pub fn is_valid_url(url: &str) -> bool {
+    let finder = LinkFinder::new();
+    let spans: Vec<_> = finder.spans(url).collect();
+    spans[0].as_str() == url && Some(&LinkKind::Url) == spans[0].kind()
+}

src/util/syntaxhighlighter.rs

@@ -0,0 +1,37 @@
+use syntect::easy::HighlightLines;
+use syntect::highlighting::{Style, ThemeSet};
+use syntect::html::append_highlighted_html_for_styled_line;
+use syntect::html::IncludeBackground::No;
+use syntect::parsing::SyntaxSet;
+use syntect::util::LinesWithEndings;
+
+pub fn html_highlight(text: &str, extension: &str) -> String {
+    let ps = SyntaxSet::load_defaults_newlines();
+    let ts = ThemeSet::load_defaults();
+
+    let syntax = ps
+        .find_syntax_by_extension(extension)
+        .or(Option::from(ps.find_syntax_plain_text()))
+        .unwrap();
+    let mut h = HighlightLines::new(syntax, &ts.themes["InspiredGitHub"]);
+
+    let mut highlighted_content: String = String::from("");
+
+    for line in LinesWithEndings::from(text) {
+        let ranges: Vec<(Style, &str)> = h.highlight_line(line, &ps).unwrap();
+        append_highlighted_html_for_styled_line(&ranges[..], No, &mut highlighted_content)
+            .expect("Failed to append highlighted line!");
+    }
+
+    let mut highlighted_content2: String = String::from("");
+    for line in highlighted_content.lines() {
+        highlighted_content2 += &*format!("<code-line>{}</code-line>\n", line);
+    }
+
+    // Rewrite colours to ones that are compatible with water.css and both light/dark modes
+    highlighted_content2 = highlighted_content2.replace("style=\"color:#323232;\"", "");
+    highlighted_content2 =
+        highlighted_content2.replace("style=\"color:#183691;\"", "style=\"color:blue;\"");
+
+    return highlighted_content2;
+}

templates/edit.html

@@ -0,0 +1,20 @@
+{% include "header.html" %}
+<form method="POST" enctype="multipart/form-data">
+    <h4>
+        Editing pasta '{{ pasta.id_as_animals() }}'
+    </h4>
+    <label>Content</label>
+    <br>
+    <textarea style="width: 100%; min-height: 100px" name="content" id="content" autofocus>{{ pasta.content }}</textarea>
+    <br>
+
+    {% if args.readonly %}
+    <input style="width: 140px; background-color: limegreen" disabled type="submit" value="Read Only"/>
+    {%- else %}
+    <input style="width: 140px; background-color: limegreen" type="submit" value="Save"/>
+    {%- endif %}
+    </td>
+
+    <br>
+</form>
+{% include "footer.html" %}

templates/footer.html

@@ -3,8 +3,12 @@
 
 <hr>
 <p style="font-size: smaller">
-    MicroBin by Daniel Szabo. Fork me on <a href="https://github.com/szabodanika/microbin">GitHub</a>!
+    {% if args.footer_text.as_ref().is_none() %}
+        MicroBin by Dániel Szabó. Fork me on <a href="https://github.com/szabodanika/microbin">GitHub</a>!
         Let's keep the Web <b>compact</b>, <b>accessible</b> and <b>humane</b>!
+    {%- else %}
+        {{ args.footer_text.as_ref().unwrap() }}
+    {%- endif %}
 </p>
 
 {%- endif %}

templates/header.html

@@ -1,34 +1,58 @@
 <html>
 <head>
+    {% if args.footer_text.as_ref().is_none() %}
         <title>MicroBin</title>
+    {%- else %}
+    <title>{{ args.title.as_ref().unwrap() }}</title>
+    {%- endif %}
+
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     {% if !args.pure_html %}
         <link rel="stylesheet" href="/static/water.css">
     {%- endif %}
     </head>
+{% if args.wide %}
 <body style="
-    max-width: 720px;
+    max-width: 1080;
         margin: auto;
         padding-left:0.5rem;
         padding-right:0.5rem;
         line-height: 1.5;
         font-size: 1.1em;
         ">
-
+{%- else %}
+<body style="
+    max-width: 720;
+        margin: auto;
+        padding-left:0.5rem;
+        padding-right:0.5rem;
+        line-height: 1.5;
+        font-size: 1.1em;
+        ">
+{%- endif %}
 <br>
 
 {% if !args.hide_header %}
 
 <b style="margin-right: 0.5rem">
-    <i><span style="font-size:2.2rem; margin-right:1rem">μ</span></i> MicroBin
+
+    {% if !args.hide_logo %}
+        <i><span style="font-size:2.2rem; margin-right:1rem">μ</span></i>
+    {%- endif %}
+
+    {% if args.footer_text.as_ref().is_none() %}
+        MicroBin
+    {%- else %}
+        {{ args.title.as_ref().unwrap() }}
+    {%- endif %}
 </b>
 
 <a href="/" style="margin-right: 0.5rem; margin-left: 0.5rem">New Pasta</a>
 
 <a href="/pastalist" style="margin-right: 0.5rem; margin-left: 0.5rem">Pasta List</a>
 
-<a href="https://github.com/szabodanika/microbin" style="margin-right: 0.5rem; margin-left: 0.5rem">GitHub</a>
+<a href="/help" style="margin-right: 0.5rem; margin-left: 0.5rem">Help</a>
 
 <hr>
 

templates/help.html

@@ -0,0 +1,153 @@
+{% include "header.html" %}
+
+
+<h2 id="welcome-to-the-microbin-wiki-">Welcome to MicroBin!</h2>
+<p>This page contains help regarding the installation, configuration and use of MicroBin. If you have questions that are not answered here, head to our <a href="https://github.com/szabodanika/microbin">GitHub repository</a>.</p>
+<h2 id="1-usage">1 Usage</h2>
+<h3 id="what-is-a-pasta-anyway-">What is a &quot;pasta&quot; anyway?</h3>
+<p>In microbin, a pasta can be:</p>
+<ul>
+    <li>A text that you want to paste from one machine to another, eg. some code</li>
+    <li>A file that you want to share, eg. a video that is too large for Discord, a zip with a code project in it or an image</li>
+    <li>A URL redirect</li>
+</ul>
+<h3 id="when-is-microbin-useful-">When is MicroBin useful?</h3>
+<p>You can use MicroBin</p>
+<ul>
+    <li>As a URL shortener/redirect service,</li>
+    <li>To send long texts to other people,</li>
+    <li>To send large files to other people,</li>
+    <li>To serve content on the web, eg. configuration files for testing, images, or any other file content using the Raw functionality,</li>
+    <li>To move files between your desktop and a server you access from the console,</li>
+    <li>As a &quot;postbox&quot; service where people can upload their files or texts, but they cannot see or remove what others sent you - just disable the pastalist page</li>
+    <li>To take notes! Simply create an editable pasta.</li>
+</ul>
+<p>...and many other things, why not get creative?</p>
+<h3 id="creating-a-pasta">Creating a Pasta</h3>
+<p>Navigate to the root of your server, for example <a href="https://microbin.myserver.com/">https://microbin.myserver.com/</a>. This should show you a form where you will at the very least see an expiration selector, a file attachment input, a content text field and a green save button. Depending on your configuration there miight also be a syntax highlight selector, an editable checkbox and a private ceckbox.</p>
+<p>Use the expiration dropdown to choose how long you want your pasta to exist. When the selected time has expired, it will be removed from the server. The content can be any text, including plain text, code, html, even a URL. A URL is a special case, because when you open the pasta again, it will redirect you to that URL instead of showing it as a text. Entering content is optional, and so is the file attachment. If you want, you can even submit a pasta completely empty.</p>
+<p>You will be redirected to the URL of the pasta, which will end with a few animal names. If you remember those animals, you can simply type them in on another machine and open your pasta elsewhere.</p>
+<p>If you have editable pastas enabled and you check the editable checkbox, then later on there will be an option to change the text content of your pasta. Selecting the private checkbox will simply prevent your pasta to show up on the pasta list page, if that is enabled.</p>
+<p>If you have syntax higlighting enabled, then select your language from the dropdown, or leave it as none if you just want to upload plain with no highlighting.</p>
+<h3 id="listing-pastas">Listing Pastas</h3>
+<p>If you have pasta listing enabled, then there is a pasta list option in the navigation bar, which will list all the pastas on the server in two groups: regular pastas and URL redirects (pastas containing nothing but a URL). If you have private pastas enabled, they will not show up here at all.</p>
+<p>From the pasta list page, you will be able to view individual pastas by clicking on their animal identifiers on the lest, view their raw contrent by clicking on the Raw button, remove them, and if you have editable pastas enabled, then open them in edit view.</p>
+<h3 id="use-microbin-from-the-console-with-curl">Use MicroBin from the console with cURL</h3>
+<p>Simple text Pasta: <code>curl -d &quot;expiration=10min&amp;content=This is a test pasta&quot; -X POST https://microbin.myserver.com/create</code></p>
+<p>File contents: <code>curl -d &quot;expiration=10min&amp;content=$( &lt; mypastafile.txt )&quot; -X POST https://microbin.myserver.com/create</code></p>
+<p>Available expiration options:
+    <code>1min</code>, <code>10min</code>, <code>1hour</code>, <code>24hour</code>, <code>1week</code>, <code>never</code></p>
+<p>Use cURL to read the pasta: <code>curl https://microbin.myserver.com/rawpasta/fish-pony-crow</code>,</p>
+<p>or to download the pasta: <code>curl https://microbin.myserver.com/rawpasta/fish-pony-crow &gt; output.txt</code> (use /file instead of /rawpasta to download attached file).</p>
+<h2 id="2-installation">2 Installation</h2>
+<h3 id="building-microbin">Building MicroBin</h3>
+<p>Simply clone the repository, build it with <code>cargo build --release</code> and run the <code>microbin</code> executable in the created <code>target/release/</code> directory. It will start on port 8080. You can change the port with <code>-p</code> or <code>--port</code> CL arguments. For other arguments see <a href="https://github.com/szabodanika/microbin/wiki">the Wiki</a>.</p>
+<pre><code>git clone https:<span class="hljs-comment">//github.com/szabodanika/microbin.git</span>
+cd microbin
+cargo build --<span class="hljs-built_in">release</span>
+./target/<span class="hljs-built_in">release</span>/microbin -p <span class="hljs-number">80</span>
+</code></pre><h3 id="microbin-as-a-service">MicroBin as a service</h3>
+<p>To install it as a service on your Linux machine, create a file called <code>/etc/systemd/system/microbin.service</code>, paste this into it with the <code>[username]</code> and <code>[path to installation directory]</code> replaced with the actual values.</p>
+<pre><code><span class="hljs-section">[Unit]</span>
+<span class="hljs-attr">Description</span>=MicroBin
+<span class="hljs-attr">After</span>=network.target
+<span class="hljs-section">
+[Service]</span>
+<span class="hljs-attr">Type</span>=simple
+<span class="hljs-attr">Restart</span>=always
+<span class="hljs-attr">User</span>=[username]
+<span class="hljs-attr">RootDirectory</span>=/
+<span class="hljs-attr">WorkingDirectory</span>=[path to installation directory]
+<span class="hljs-attr">ExecStart</span>=[path to installation directory]/target/release/microbin
+<span class="hljs-section">
+[Install]</span>
+<span class="hljs-attr">WantedBy</span>=multi-user.target
+</code></pre><p>Here is my <code>microbin.service</code> for example, with some optional arguments:</p>
+<pre><code><span class="hljs-section">[Unit]</span>
+<span class="hljs-attr">Description</span>=MicroBin
+<span class="hljs-attr">After</span>=network.target
+<span class="hljs-section">
+[Service]</span>
+<span class="hljs-attr">Type</span>=simple
+<span class="hljs-attr">Restart</span>=always
+<span class="hljs-attr">User</span>=ubuntu
+<span class="hljs-attr">RootDirectory</span>=/
+
+<span class="hljs-comment"># This is the directory where I want to run microbin. It will store all the pastas here.</span>
+<span class="hljs-attr">WorkingDirectory</span>=/home/ubuntu/server/microbin
+
+<span class="hljs-comment"># This is the location of my executable - I also have 2 optional features enabled</span>
+<span class="hljs-attr">ExecStart</span>=/home/ubuntu/server/microbin/target/release/microbin --editable --linenumbers --highlightsyntax
+
+<span class="hljs-comment"># I keep my installation in the home directory, so I need to add this</span>
+<span class="hljs-attr">ProtectHome</span>=<span class="hljs-literal">off</span>
+<span class="hljs-section">
+[Install]</span>
+<span class="hljs-attr">WantedBy</span>=multi-user.target
+</code></pre><p>Then start the service with <code>systemctl start microbin</code> and enable it on boot with <code>systemctl enable microbin</code>. To update your MicroBin, simply update or clone the repository again, build it again, and then restart the service with <code>systemctl restart microbin</code>. An update will never affect your existing pastas, unless there is a breaking change in the data model (in which case MicroBin just won&#39;t be able to import your DB), which will always be mentioned explicitly.</p>
+<h3 id="nginx-configuration">NGINX configuration</h3>
+<pre><code><span class="hljs-section">server</span> {
+    <span class="hljs-comment"># I have HTTPS enabled using certbot - you can use HTTP of course if you want!</span>
+  <span class="hljs-attribute">listen</span> <span class="hljs-number">443</span> ssl; <span class="hljs-comment"># managed by Certbot</span>
+
+    <span class="hljs-attribute">server_name</span>    microbin.myserver.com;
+
+    <span class="hljs-attribute">location</span> / {
+            <span class="hljs-comment"># Make sure to change the port if you are not running MicroBin at 8080!</span>
+        <span class="hljs-attribute">proxy_pass</span>            http://127.0.0.1:8080<span class="hljs-variable">$request_uri</span>;
+        <span class="hljs-attribute">proxy_set_header</span>    Host <span class="hljs-variable">$host</span>;
+        <span class="hljs-attribute">proxy_set_header</span>    X-Forwarded-Proto <span class="hljs-variable">$scheme</span>;
+        <span class="hljs-attribute">proxy_set_header</span>    X-Real-IP <span class="hljs-variable">$remote_addr</span>;
+        <span class="hljs-attribute">proxy_set_header</span>    X-Forwarded-For <span class="hljs-variable">$proxy_add_x_forwarded_for</span>;
+    }
+
+    <span class="hljs-comment"># Limit content size - I have 1GB because my MicroBin server is private, no one else will use it.</span>
+    <span class="hljs-attribute">client_max_body_size</span> <span class="hljs-number">1024M</span>;
+
+  <span class="hljs-attribute">ssl_certificate</span> /etc/letsencrypt/live/microbin.myserver.com/fullchain.pem; <span class="hljs-comment"># managed by Certbot</span>
+  <span class="hljs-attribute">ssl_certificate_key</span> /etc/letsencrypt/live/microbin.myserver.com/privkey.pem; <span class="hljs-comment"># managed by Certbot</span>
+  <span class="hljs-attribute">include</span> /etc/letsencrypt/options-ssl-nginx.conf; <span class="hljs-comment"># managed by Certbot</span>
+  <span class="hljs-attribute">ssl_dhparam</span> /etc/letsencrypt/ssl-dhparams.pem; <span class="hljs-comment"># managed by Certbot</span>
+}
+</code></pre><h2 id="3-command-line-arguments">3 Command Line Arguments</h2>
+<p>There is an ever expanding list of customisations built into MicroBin so you can use it the way you want. Instead of a configuration file, we simply use arguments that you pass to the executable, making the workflow even simpler. Read the following options and if you cannot find what you need, you can always open an issue at our GitHub repository and request a new feature!</p>
+<h3 id="-auth-username-auth_username-">--auth-username [AUTH_USERNAME]</h3>
+<p>Require username for HTTP Basic Authentication when visiting the service. If <code>--auth-username</code> is set but <code>--auth-password</code> is not, just leave the password field empty when logging in. You can also just go to <a href="https://username:password@yourserver.net">https://username:password@yourserver.net</a> or <a href="https://username@yourserver.net">https://username@yourserver.net</a> if password is not set instead of typing into the password</p>
+<h3 id="-auth-password-auth_password-">--auth-password [AUTH_PASSWORD]</h3>
+<p>Require password for HTTP Basic Authentication when visiting the service. Will not have any affect unless <code>--auth-username</code> is also set. If <code>--auth-username</code> is set but <code>--auth-password</code> is not, just leave the password field empty when logging in. You can also just go to <a href="https://username:password@yourserver.net">https://username:password@yourserver.net</a> or <a href="https://username@yourserver.net">https://username@yourserver.net</a> if password is not set instead of typing into the password prompt.</p>
+<h3 id="-editable">--editable</h3>
+<p>Enables editable pastas. You will still be able to make finalised pastas but there will be an extra checkbox to make your new pasta editable from the pasta list or the pasta view page.</p>
+<h3 id="-footer_text-text-">--footer_text [TEXT]</h3>
+<p>Replaces the default footer text with your own. If you want to hide the footer, use --hide-footer instead.</p>
+<h3 id="-h-help">-h, --help</h3>
+<p>Show all commands in the terminal.</p>
+<h3 id="-hide-footer">--hide-footer</h3>
+<p>Hides the footer on every page.</p>
+<h3 id="-hide-header">--hide-header</h3>
+<p>Hides the navigation bar on every page.</p>
+<h3 id="-hide-logo">--hide-logo</h3>
+<p>Hides the MicroBin logo from the navigation bar on every page.</p>
+<h3 id="-no-listing">--no-listing</h3>
+<p>Disables the /pastalist endpoint, essentially making all pastas private.</p>
+<h3 id="-highlightsyntax">--highlightsyntax</h3>
+<p>Enables syntax highlighting support. When creating a new pasta, a new dropdown selector will be added where you can select your pasta&#39;s syntax, or just leave it empty for no highlighting.</p>
+<h3 id="-p-port-port-">-p, --port [PORT]</h3>
+<p>Default value: 8080</p>
+<p>Sets the port for the server will be listening on.</p>
+<h3 id="-private">--private</h3>
+<p>Enables private pastas. Adds a new checkbox to make your pasta private, which then won&#39;t show up on the pastalist page. With the URL to your pasta, it will still be accessible.</p>
+<h3 id="-pure-html">--pure-html</h3>
+<p>Disables main CSS styling, just uses a few in-line stylings for the layout. With this option you will lose dark-mode support.</p>
+<h3 id="-readonly">--readonly</h3>
+<p>Disables adding/editing/removing pastas entirely.</p>
+<h3 id="-title-title-">--title [TITLE]</h3>
+<p>Replaces &quot;MicroBin&quot; with your title of choice in the navigation bar.</p>
+<h3 id="-t-threads-threads-">-t, --threads [THREADS]</h3>
+<p>Default value: 1</p>
+<p>Number of workers MicroBin is allowed to have. Increase this to the number of CPU cores you have if you want to go beast mode, but for personal use one worker is enough.</p>
+<h3 id="-v-version">-V, --version</h3>
+<p>Displays your MicroBin&#39;s version information.</p>
+<h3 id="-wide">--wide</h3>
+<p>Changes the maximum width of the UI from 720 pixels to 1080 pixels.</p>
+
+{% include "footer.html" %}

templates/index.html

@@ -1,6 +1,11 @@
 {% include "header.html" %}
 <form action="upload" method="POST" enctype="multipart/form-data">
     <br>
+    <div style="display: grid;
+        grid-gap: 4px;
+        grid-template-columns: repeat(auto-fit, 234px);
+        grid-template-rows: repeat(1, 100px);  ">
+        <div>
             <label for="expiration">Expiration</label><br>
             <select style="width: 100%;" name="expiration" id="expiration">
                 <optgroup label="Expire">
@@ -12,16 +17,83 @@
                 </optgroup>
                 <option value="never">Never Expire</option>
             </select>
+        </div>
+        {% if args.highlightsyntax %}
+        <div>
+            <label for="syntax-highlight">Syntax Highlighting</label><br>
+            <select style="width: 100%;" name="syntax-highlight" id="syntax-highlight">
+                <option value="none">None</option>
+                <optgroup label="Source Code">
+                    <option value="sh">Bash Shell</option>
+                    <option value="c">C</option>
+                    <option value="cpp">C++</option>
+                    <option value="cs">C#</option>
+                    <option value="pas">Delphi</option>
+                    <option value="erl">Erlang</option>
+                    <option value="go">Go</option>
+                    <option value="hs">Haskell</option>
+                    <option value="html">HTML</option>
+                    <option value="lua">Lua</option>
+                    <option value="lisp">Lisp</option>
+                    <option value="java">Java</option>
+                    <option value="js">JavaScript</option>
+                    <option value="kt">Kotlin</option>
+                    <option value="py">Python</option>
+                    <option value="php">PHP</option>
+                    <option value="r">R</option>
+                    <option value="rs">Rust</option>
+                    <option value="rb">Ruby</option>
+                    <option value="sc">Scala</option>
+                    <option value="swift">Swift</option>
+                </optgroup>
+                <optgroup label="Descriptors">
+                    <!-- no toml support ;-( -->
+                    <option value="json">TOML</option>
+                    <option value="yaml">YAML</option>
+                    <option value="json">JSON</option>
+                    <option value="xml">XML</option>
+                </optgroup>
+            </select>
+        </div>
+        {%- else %}
+        <input type="hidden" name="syntax-highlight" value="none">
+        {%- endif %}
+
+        <div>
+            <label>File attachment</label>
             <br>
+            <input style="width: 100%;" type="file" id="file" name="file">
+        </div>
+    </div>
     <label>Content</label>
     <br>
     <textarea style="width: 100%; min-height: 100px" name="content" autofocus></textarea>
     <br>
-    <label>File attachment</label>
+    <div style="display: grid;
-    <br>
+        grid-gap: 4px;
-    <input style="width: 100%;" type="file" id="file" name="file">
+        grid-template-columns: repeat(auto-fit, 120px);
-    <br>
+        grid-template-rows: repeat(1, 50px);  ">
-    <input style="width: 120px; background-color: limegreen" ; type="submit" value="Save"/>
+        {% if args.editable %}
+        <div>
+            <input type="checkbox" id="editable" name="editable" value="editable">
+            <label for="editable">Editable</label>
+        </div>
+        {%- endif %}
+        {% if args.private %}
+        <div>
+            <input type="checkbox" id="private" name="private" value="private">
+            <label for="private">Private</label>
+        </div>
+        {%- endif %}
+    </div>
+
+    {% if args.readonly %}
+    <input style="width: 140px; background-color: limegreen" disabled type="submit" value="Read Only"/>
+    {%- else %}
+    <input style="width: 140px; background-color: limegreen" type="submit" value="Save"/>
+    {%- endif %}
+    </td>
+
     <br>
 </form>
 {% include "footer.html" %}

templates/pasta.html

@@ -1,9 +1,44 @@
 {% include "header.html" %}
 <a style="margin-right: 0.5rem" href="/raw/{{pasta.id_as_animals()}}">Raw Text Content</a>
 {% if pasta.file != "no-file" %}
-<a  style="margin-right: 0.5rem; margin-left: 0.5rem" href="/file/{{pasta.id_as_animals()}}/{{pasta.file}}">Attached file '{{pasta.file}}'</a>
+<a style="margin-right: 0.5rem; margin-left: 0.5rem" href="/file/{{pasta.id_as_animals()}}/{{pasta.file}}">Attached file
+    '{{pasta.file}}'</a>
+{%- endif %}
+{% if pasta.editable %}
+<a style="margin-right: 0.5rem; margin-left: 0.5rem" href="/edit/{{pasta.id_as_animals()}}">Edit</a>
 {%- endif %}
 <a style="margin-right: 0.5rem; margin-left: 0.5rem" href="/remove/{{pasta.id_as_animals()}}">Remove</a>
-<pre><code>{{pasta}}</code></pre>
+{% if args.highlightsyntax %}
+<pre><code>{{pasta.content_syntax_highlighted()}}</code></pre>
+{%- else %}
+<pre><code>{{pasta.content_not_highlighted()}}</code></pre>
+{%- endif %}
+
+<style>
+code-line {
+  counter-increment: listing;
+  text-align: right;
+  float: left;
+  clear: left;
+}
+
+code-line::before {
+  content: counter(listing);
+  display: inline-block;
+  float: left;
+  padding-left: auto;
+  margin-left: auto;
+  text-align: left;
+  width: 1.6rem;
+  border-right: 1px solid lightgrey;
+  color: grey;
+  margin-right: 0.4rem;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+</style>
 
 {% include "footer.html" %}

templates/pastalist.html

@@ -9,7 +9,11 @@
 <br>
 {%- else %}
 <br>
+{% if args.pure_html %}
+<table border="1" style="width: 100%">
+{% else %}
 <table style="width: 100%">
+    {% endif %}
     <thead>
     <tr>
         <th colspan="4">Pastas</th>
@@ -47,6 +51,9 @@
             {% if pasta.file != "no-file" %}
             <a style="margin-right:1rem" href="/file/{{pasta.id_as_animals()}}/{{pasta.file}}">File</a>
             {%- endif %}
+            {% if pasta.editable %}
+            <a style="margin-right:1rem" href="/edit/{{pasta.id_as_animals()}}">Edit</a>
+            {%- endif %}
             <a href="/remove/{{pasta.id_as_animals()}}">Remove</a>
         </td>
     </tr>
@@ -55,12 +62,16 @@
     </tbody>
 </table>
 <br>
-<table>
+{% if args.pure_html %}
+<table border="1" style="width: 100%">
+{% else %}
+<table style="width: 100%">
+{% endif %}
     <thead>
     <tr>
         <th colspan="4">URL Redirects</th>
     </tr>
-    <tr >
+    <tr>
         <th>
             Key
         </th>
@@ -89,12 +100,15 @@
         </td>
         <td>
             <a style="margin-right:1rem" href="/raw/{{pasta.id_as_animals()}}">Raw</a>
+            {% if pasta.editable %}
+            <a style="margin-right:1rem" href="/edit/{{pasta.id_as_animals()}}">Edit</a>
+            {%- endif %}
             <a href="/remove/{{pasta.id_as_animals()}}">Remove</a>
         </td>
     </tr>
     {%- endif %}
     {% endfor %}
-</tbody>
+    </tbody>
 </table>
 <br>
 {%- endif %}