-Thank you for installing Lapis-chan! <3
-]]
-
-return {
- GET = function(self)
- self.page_title = "Install Lapis-chan"
- self.board = { theme = "yotsuba_b" }
-
- -- Do we already have data?
- local users = Users:get_users()
- local boards = Boards:get_boards()
- local pages = Pages:get_pages()
-
- -- We did it!
- if #users > 0 and #boards > 0 and #pages > 0 then
- return success
- end
-
- -- Get list of themes
- self.themes = {}
- for file in lfs.dir("."..self.styles_url) do
- local name, ext = string.match(file, "^(.+)(%..+)$")
- if name ~= "reset" and
- name ~= "posts" and
- name ~= "style" and
- name ~= "tegaki" and
- ext == ".css" then
- table.insert(self.themes, name)
- end
- end
-
- return { render = "install" }
- end,
- POST = function(self)
- self.page_title = "Install Lapis-chan"
- self.board = { theme = "yotsuba_b" }
-
- -- Do we already have data?
- local users = Users:get_users()
- local boards = Boards:get_boards()
- local pages = Pages:get_pages()
-
- -- We did it!
- if #users > 0 and #boards > 0 and #pages > 0 then
- return success
- end
-
- local errs = validate(self.params, {
- { "user_username", exists=true, max_length=255 },
- { "user_password", min_length=4, max_length=255 },
- { "name", exists=true, max_length=10 },
- { "title", min_length=2, max_length=255 },
- { "subtext", max_length=255 },
- { "rules" },
- { "ban_message", max_length=255 },
- { "anon_name", max_length=255 },
- { "theme", exists=true },
- { "pages", exists=true },
- { "threads_per_page", exists=true },
- { "thread_file_limit", exists=true },
- { "post_limit", exists=true },
- { "thread_file", exists=true },
- { "thread_comment", exists=true },
- { "post_file", exists=true },
- { "post_comment", exists=true },
- { "text_only", exists=true },
- { "filetype_image", exists=true },
- { "filetype_audio", exists=true },
- { "draw", exists=true },
- { "archive", exists=true },
- { "archive_time", exists=true },
- { "group", exists=true }
- })
-
- local out
- if errs then
- out = "\n"
- for _, err in ipairs(errs) do
- out = out .. "" .. err .. "
\n"
- end
- out = out .. [[
-
-
- ]]
- end
-
- if out then
- return out
- end
-
- -- Add new user
- Users:create_user {
- username = self.params.user_username,
- password = self.params.user_password,
- admin = true,
- mod = false,
- janitor = false
- }
-
- -- Add new board
- Boards:create_board {
- name = self.params.name,
- title = self.params.title,
- subtext = self.params.subtext,
- rules = self.params.rules,
- anon_name = self.params.anon_name,
- theme = self.params.theme,
- posts = 0,
- pages = self.params.pages,
- threads_per_page = self.params.threads_per_page,
- text_only = self.params.text_only,
- filetype_image = self.params.filetype_image,
- filetype_audio = self.params.filetype_audio,
- draw = self.params.draw,
- thread_file = self.params.thread_file,
- thread_comment = self.params.thread_comment,
- thread_file_limit = self.params.thread_file_limit,
- post_file = self.params.post_file,
- post_comment = self.params.post_comment,
- post_limit = self.params.post_limit,
- archive = self.params.archive,
- archive_time = self.params.archive_time * 24 * 60 * 60,
- group = self.params.group
- }
-
- -- Add FAQ page
- Pages:create_page {
- title = "Frequently Asked Questions",
- slug = "faq",
- content = faq
- }
- end
-}
diff --git a/misc/website/backend/app/src/apps/web/pages.lua b/misc/website/backend/app/src/apps/web/pages.lua
deleted file mode 100755
index 54d4547..0000000
--- a/misc/website/backend/app/src/apps/web/pages.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local lapis = require "lapis"
-local app = lapis.Application()
-app.__base = app
-app.name = "web.pages."
-app.handle_404 = require "apps.web.internal.code_404"
-
-app:match("index", "/", require "apps.web.pages.index")
-app:match("c404", "/404", require "apps.web.internal.code_404") -- FIXME: remove this route
-app:match("faq", "/faq", require "apps.web.pages.rules") -- FIXME: need a faq page
-app:match("rules", "/rules", require "apps.web.pages.rules")
-app:match("logout", "/logout", require "apps.web.pages.logout")
-app:match("page", "/:page", require "apps.web.pages.page")
-
-return app
diff --git a/misc/website/backend/app/src/apps/web/pages/index.lua b/misc/website/backend/app/src/apps/web/pages/index.lua
deleted file mode 100755
index 64c32e4..0000000
--- a/misc/website/backend/app/src/apps/web/pages/index.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return function(self)
-
- -- Page title
- self.page_title = self.i18n("index")
-
- -- Display a theme
- self.board = { theme = "yotsuba_b" }
-
- return { render = "index" }
-end
diff --git a/misc/website/backend/app/src/apps/web/pages/logout.lua b/misc/website/backend/app/src/apps/web/pages/logout.lua
deleted file mode 100755
index b7d0ccd..0000000
--- a/misc/website/backend/app/src/apps/web/pages/logout.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return function(self)
- -- Logout
- self.session.name = nil
- self.session.admin = nil
- self.session.mod = nil
- self.session.janitor = nil
-
- return { redirect_to = self:url_for("web.pages.index") }
-end
diff --git a/misc/website/backend/app/src/apps/web/pages/page.lua b/misc/website/backend/app/src/apps/web/pages/page.lua
deleted file mode 100755
index 36add7f..0000000
--- a/misc/website/backend/app/src/apps/web/pages/page.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local Boards = require "models.boards"
-local Pages = require "models.pages"
-local markdown = require "markdown"
-
-return function(self)
- -- Get all board data
- self.boards = Boards:get_boards()
-
- -- Get page
- self.page = Pages:get_page(self.params.page)
-
- if not self.page then
- return self:write({ redirect_to = self:url_for("web.pages.c404") })
- end
-
- -- Page title
- self.page_title = self.page.title
-
- -- Markdown
- if self.page.content then
- self.page.content = markdown(self.page.content)
- end
-
- -- Display a theme
- self.board = { theme = "yotsuba_b" }
-
- return { render = "page" }
-end
diff --git a/misc/website/backend/app/src/apps/web/pages/rules.lua b/misc/website/backend/app/src/apps/web/pages/rules.lua
deleted file mode 100755
index f45e50e..0000000
--- a/misc/website/backend/app/src/apps/web/pages/rules.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-return function(self)
-
- -- Page title
- self.page_title = self.i18n("rules")
-
- -- Display a theme
- self.board = { theme = "yotsuba_b" }
-
- for _, board in ipairs(self.boards) do
- board.url = self:url_for("web.boards.board", { board=board.name })
- if board.rules then
- board.rules = _G.markdown(board.rules)
- else
- board.rules = ""
- end
- end
-
- return { render = "rules" }
-end
diff --git a/misc/website/backend/app/src/locale/fr.lua b/misc/website/backend/app/src/locale/fr.lua
deleted file mode 100755
index 654f586..0000000
--- a/misc/website/backend/app/src/locale/fr.lua
+++ /dev/null
@@ -1,234 +0,0 @@
-return { fr = {
-
- --==[[ Navigation ]]==--
-
- archive = "Archive",
- bottom = "Bas",
- catalog = "Catalogue",
- index = "Index",
- refresh = "Rafraîchir",
- ["return"] = "Retourner",
- return_board = "Retourner au babillard",
- return_index = "Retourner à l'index",
- return_thread = "Retourner au fil de discussion",
- top = "Haut",
-
- --==[[ Error Messages ]]==--
-
- -- Controller error messages
- err_ban_reason = "Aucune Reçue.",
- err_board_used = "Le nom du Babillard est déjà utilisé.",
- err_not_admin = "Vous n'êtes pas un administrateur.",
- err_orphaned = "Le Fil de Discussion nº%s est orphelin.",
- err_slug_used = "Le slug de la page est déjà utilisée.",
- err_user_used = "Le nom d'utilisateur est dèja utilisé.",
-
- -- Model error messages
- err_contribute = "Vous devez poster un commentaire ou un fichier.",
- err_locked_thread = "Le fil de discussion No.%s est verrouillé.",
- err_no_files = "Les fichiers ne sont pas acceptés sur ce babillard.",
-
- err_comment_post = "Un commentaire est requis pour poster sur ce babillard.",
- err_comment_thread = "Un commentaire est requis pour poster un fil de discussion sur ce babillard.",
-
- err_create_ann = "Impossible de créer un annoncement: %s.",
- err_create_ban = "Impossible de bannir l'IP: %s.",
- err_create_board = "Impossible de créer le babillard: /%s/ - %s.",
- err_create_page = "Impossible de créer la page: /%s/ - %s.",
- err_create_post = "Impossible de soumettre le poste.",
- err_create_report = "Impossible de reporter le post No.%s.",
- err_create_thread = "Impossible de créer un nouveau fil de discussion.",
-
- err_delete_board = "Impossible de supprimer le babillard: /%s/ - %s.",
- err_delete_post = "Impossible de supprimer le poste No.%s.",
- err_create_user = "Impossible de créer l'utilisateur: %s.",
-
- err_file_exists = "Le fichier existe déjà sur ce babillard.",
- err_file_limit = "Le fil de discussion No.%s a atteint sa limite de fichier.",
- err_file_post = "Un fichier est requis pour poster sur ce babillard.",
- err_file_thread = "Un fichier est requis pour poster un fil de discussion sur ce babillard.",
-
- err_invalid_board = "Babillard invalide: /%s/.",
- err_invalid_ext = "Type de fichier invalide: %s.",
- err_invalid_image = "Données d'image invalides.",
- err_invalid_post = "Le poste No.%s n'est pas valide.",
- err_invalid_user = "Nom d'utilisateur ou mot de passe invalide.",
-
- --==[[ 404 ]]==--
-
- ["404"] = "404 - Page Introuvable",
-
- --==[[ Administration ]]==--
-
- -- General
- admin_panel = "Panneau Administratif",
- administrator = "Administrateur",
- announcement = "Annoncement",
- archive_days = "Nombre de jours à garder les Fils de Discussion dans l'Archive",
- archive_pruned = "Archiver les Fils de Discussion Réduites",
- board = "Babillard",
- board_group = "Group de babillard",
- board_title = "Nom de Babillard",
- bump_limit = "Limite pour remonter un fil de discussion",
- content_md = "Contenu (Markdown)",
- default_name = "Nom par Défaut",
- draw_board = "Babillard à Dessin",
- file = "Fichier",
- file_limit = "Limite de fichiers dans un Fil de Discussion",
- global = "Global",
- index_boards = "Babillards Présent",
- janitor = "Concierge",
- login = "Connexion",
- logout = "Déconnexion",
- moderator = "Modérateur",
- num_pages = "Pages Actives",
- num_threads = "Fils de Discussion par Page",
- password = "Mot de Passe",
- password_old = "Ancient Mot de Passe",
- password_retype = "Confirmer le Mot de Passe",
- post_comment_required = "Exiger un commentaire pour pouvoir poster",
- post_file_required = "Exiger un Fichier pour pouvoir poster",
- regen_thumb = "Régénérer les Miniatures",
- reply = "Répondre",
- rules = "Les Règles",
- name = "Nom",
- subtext = "Sous-texte",
- success = "Succès",
- text_board = "Babillard à Texte",
- theme = "Thème",
- thread_comment_required = "Exiger un Commentaire ",
- thread_file_required = "Exiger un Fil de Discussion",
- slug = "Slug",
- username = "Nom d'utilisateur",
- yes = "Oui",
- no = "Non",
-
- -- Announcements
- create_ann = "Créer un Annoncement",
- modify_ann = "Modifier un Annoncement",
- delete_ann = "Supprimer un Annoncement",
- created_ann = "Création de l'annoncement: %s réussie.",
- modified_ann = "Modification de l'annoncement: %s réussie.",
- deleted_ann = "Suppression de l'annoncement: %s réussie.",
-
- -- Boards
- create_board = "Créer un Babillard",
- modify_board = "Modifier un Babillard",
- delete_board = "Supprimer un Babillard",
- created_board = "Création du Babillard: /%s/ - %s réussie.",
- modified_board = "Modification du Babillard : /%s/ - %s réussie.",
- deleted_board = "Suppression du Babillard : /%s/ - %s réussie.",
-
- -- Pages
- create_page = "Créer une Page",
- modify_page = "Modifier une Page",
- delete_page = "Supprimer une Page",
- created_page = "Création de la page : /%s/ - %s réussie.",
- modified_page = "Modification de la page : /%s/ - %s réussie.",
- deleted_page = "Suppression de la page : /%s/ - %s réussie.",
-
- -- Reports
- view_report = "Afficher un Rapport",
- delete_report = "Supprimer un Rapport",
- deleted_report = "Suppression du Rapport: %s réussie.",
-
- -- Users
- create_user = "Créer un Utilisateur",
- modify_user = "Modifier un Utilisateur",
- delete_user = "Supprimer un Utilisateur",
- created_user = "Création de l'utilisateur: %s réussie.",
- modified_user = "Modification de l'utilisateur: %s réussie.",
- deleted_user = "Suppression de l'utilisateur: %s réussie.",
-
- --==[[ Archive ]]==--
-
- arc_display = "Affichage de %{n_thread} %{p_thread} expirés depuis %{n_day} %{p_day} ",
- arc_number = "nº",
- arc_name = "Nom",
- arc_excerpt = "Extrait",
- arc_replies = "Réponses",
- arc_view = "Afficher",
-
- --==[[ Ban ]]==--
-
- ban_title = "Banni!",
- ban_reason = "Vous avez été banni pour la raison suivante:",
- ban_expire = "Votre ban expirera le %{expire}.",
- ban_ip = "Selon avec notre serveur, votre IP est: %{ip}.",
-
- --==[[ Catalog ]]==--
-
- cat_stats = "R: %{replies} / F: %{files}",
-
- --==[[ Copyright ]]==--
-
- copy_software = "Réalisé avec %{software} %{version}",
- copy_download = "Télécharger à partir de %{github}",
-
- --==[[ Forms ]]==--
-
- form_ban = "Bannir l'Utilisateur",
- form_ban_display = "Afficher le Ban",
- form_ban_board = "Ban Local",
- form_ban_reason = "Raison du ban",
- form_ban_time = "Durée (en jours) à bannir l'utilisateur",
- form_clear = "Effacer",
- form_delete = "Supprimer le Poste",
- form_draw = "Dessiner",
- form_lock = "Verrouiller le Fil de Discussion",
- form_override = "Fichiers Illimités",
- form_readme = "Veuillez lire [%{rules}] et la [%{faq}] avant de poster.",
- form_remix = "Remixer l'Image",
- form_report = "Reporter le Poste",
- form_required = "Champ Requis",
- form_save = "Épargner le Fil de Discussion",
- form_sticky = "Épingler le Fil de Discussion",
- form_submit = "Soumettre le Poste",
- form_submit_name = "Nom",
- form_submit_name_help = "Donnez-vous un nom , un tripcode ou les deux (facultatif)",
- form_submit_subject = "Sujet",
- form_submit_subject_help = "Définir le sujet de la discussion (facultatif)",
- form_submit_options = "Options",
- form_submit_options_help = "Sage: poster sans faire monter le fil de discussion (À venir) (facultatif)",
- form_submit_comment = "Commentaire",
- form_submit_comment_help = "Contribuer à la discussion (ou non)",
- form_submit_file = "Fichier",
- form_submit_file_help = "Télécharger un fichier",
- form_submit_draw = "Dessiner",
- form_submit_draw_help = "Dessiner ou remixer une image",
- form_submit_spoiler = "Spoiler",
- form_submit_spoiler_help = "Replacer la miniature avec une image sans spoiler",
- form_submit_mod = "Modérateur",
- form_submit_mod_help = "Mettre un drapeau sur ce fil de discussion",
- form_width = "Largeur",
- form_height = "Hauteur",
-
- --==[[ Posts ]]==--
-
- post_link = "Lier à ce poste",
- post_lock = "Le fil de discussion est verrouillé",
- post_hidden = "%{n_post} %{p_post} et %{n_file} %{p_file} omis. %{click} pour afficher.",
- post_override = "Ce fil de discussion accepte un nombre illimité de fichiers",
- post_reply = "Répondre à ce poste",
- post_sticky = "Le fil de discussion est épinglé",
- post_save = "Le fil de discussion ne sera pas enlevé automatiquement",
-
- --==[[ Plurals ]]==--
-
- days = {
- one = "jour",
- other = "jours"
- },
- files = {
- one = "fichier",
- other = "fichiers"
- },
- posts = {
- one = "poste",
- other = "postes"
- },
- threads = {
- one = "fil de discussion",
- other = "fils de discussion"
- },
-}}
diff --git a/misc/website/backend/app/src/locale/phpceo.lua b/misc/website/backend/app/src/locale/phpceo.lua
deleted file mode 100755
index 8f399d9..0000000
--- a/misc/website/backend/app/src/locale/phpceo.lua
+++ /dev/null
@@ -1,234 +0,0 @@
-return { phpceo = {
-
- --==[[ Navigation ]]==--
-
- archive = "Gallery Of Our Greatness",
- bottom = "Best For Last",
- catalog = "Products And Services",
- index = "Home Page",
- refresh = "Experience A Rejuvinating Meeting",
- ["return"] = "Reconsider",
- return_board = "Reconsider that product",
- return_index = "Reconsider that home page",
- return_thread = "Reconsider that email chain",
- top = "I'm The Best",
-
- --==[[ Error Messages ]]==--
-
- -- Controller error messages
- err_ban_reason = "Hit 'enter' too early.",
- err_board_used = "That product name is in use, and we don't want to spend money on lawyers.",
- err_not_admin = "Call HR.",
- err_orphaned = "I accidentally lost the email chain about %s, do you know where it went?",
- err_slug_used = "SEO CONFLICT, GOOGLE GROWTHHACK ERROR.",
- err_user_used = "You can't be Brandon, *I'm* Brandon!",
-
- -- Model error messages
- err_contribute = "Your argument needs more pictures or more words. I can't decide which. I'm fickle like that.",
- err_locked_thread = "Email chain about %s is locked, I blame Outlook.",
- err_no_files = "The cloud is busy, it does not want your attachments.",
-
- err_comment_post = "Your pitch is great, except I don't know what you're talking about. Use your words.",
- err_comment_thread = "Did you seriously just try to send an email without a body? At least put in your signature. Have some pride, Intern.",
-
- err_create_ann = "I couldn't stop yelling long enough to say: %s.",
- err_create_ban = "These lottery numbers didn't work: %s.",
- err_create_board = "I don't know how to make the product: /%s/ - %s.",
- err_create_page = "Pages? No, we're paperless now, we don't need: /%s/ - %s.",
- err_create_post = "I didn't read your email, let's set up a meeting in a few minutes where you read it to me.",
- err_create_report = "I don't see anything wrong with an email about %s and I have no inclination to in my life.",
- err_create_thread = "The reply button is broke! This is effecting production.",
-
- err_delete_board = "I tried to delete those emails about: /%s/ - but I just couldn't %s.",
- err_delete_post = "I clicked the flag, did that delete %s? No? Well what else am I supposed to do?",
- err_create_user = "I don't know who %s is and frankly I don't give a big enough damn to learn.",
-
- err_file_exists = "Johnson! I already have that spreadsheet! I think. Probably.",
- err_file_limit = "THE CLOUD IS FULL, IF YOU SUBMIT ANYTHING ELSE TO %s THE INTERNET WILL GO DOWN.",
- err_file_post = "If you want my attention you better use something other than words because I sure as hell ain't reading anything that comes across this desk today.",
- err_file_thread = "This email chain said 'post your favorite confidential documents' but you forgot to attach any. Try that one again.",
-
- err_invalid_board = "CORRUPT EMAIL: /%s/.",
- err_invalid_ext = "Do I look like I know what a %s is?",
- err_invalid_image = "It looks like you sent a picture but what I got was a digital clown.",
- err_invalid_post = "Whatever %s was about, I've decided to politely disregard it as 'wrong opinion'.",
- err_invalid_user = "I don't know who you are or what you're doing. I'm calling the police.",
-
- --==[[ 404 ]]==--
-
- ["404"] = "404 - That's 3 better than a 401k!",
-
- --==[[ Administration ]]==--
-
- -- General
- admin_panel = "CEO DASHBOARD",
- administrator = "CEO",
- announcement = "Important things that come out of my mouth",
- archive_days = "Days to Archive Threads",
- archive_pruned = "Gas these.",
- board = "Chain",
- board_group = "Chain Group",
- board_title = "Email Subject",
- bump_limit = "Burp Excusal Tolerance",
- content_md = "Markers",
- default_name = "What is this?",
- draw_board = "MSPAINT but for the Internet",
- file = "Datum gap",
- file_limit = "Maximum Cloud Precipitation Ratio",
- global = "Everyone Has To Deal With",
- index_boards = "Product Selection",
- janitor = "Unpaid Intern",
- login = "Clock In",
- logout = "Clock Out",
- moderator = "Enforcer",
- num_pages = "Reasons this company is great",
- num_threads = "How much I can stand of this",
- password = "Digital Hash Salt",
- password_old = "That old thing.",
- password_retype = "Do it again, it'll be funny.",
- post_comment_required = "Need Context",
- post_file_required = "Insert Meme",
- regen_thumb = "Rectify Pixels",
- reply = "Interject",
- rules = "Things That Don't Apply To Me",
- name = "Bob",
- subtext = "sub-who?",
- success = "Me, The Physical Embodiment of Greatness",
- text_board = "Stuff I Won't Read",
- theme = "Birthday Party",
- thread_comment_required = "CONVERSE BEFORE CLOUD",
- thread_file_required = "INSERT FILE FOR CLOUD",
- slug = "CLOUD RESOURCE IDENTIFIER",
- username = "User Identifcation String",
- yes = "I Am Glad To Blindly Accept This",
- no = "Not Exactly",
-
- -- Announcements
- create_ann = "Open Mouth, Insert Foot",
- modify_ann = "Damage Control",
- delete_ann = "I never said that, you can't prove it.",
- created_ann = "I believe %s is the lifeblood of this company.",
- modified_ann = "What I meant to say was actually %s.",
- deleted_ann = "What announcement? %s you say? Doesn't ring a bell.",
-
- -- Boards
- create_board = "More Email!",
- modify_board = "Different Email",
- delete_board = "Less Email!",
- created_board = "How do you feel about /%s/ - %s? How about agilefall?",
- modified_board = "I hope we fixed the issue about /%s/ - %s because I was getting tired of covering for him.",
- deleted_board = "I forgot I don't even like /%s/ - %s.",
-
- -- Pages
- create_page = "Create new effigy to my greatness.",
- modify_page = "Make this less bad.",
- delete_page = "I ain't readin' this.",
- created_page = "I heard about /%s/ - %s online, let me tell you how we can pivot this.",
- modified_page = "I saw some stuff about /%s/ - %s so I fixed it.",
- deleted_page = "Good news, I got rid of those books about: /%s/ - %s.",
-
- -- Reports
- view_report = "I said *what*?",
- delete_report = "Forget about that.",
- deleted_report = "I changed my mind about %s and you can too.",
-
- -- Users
- create_user = "Hire",
- modify_user = "Rectify Person",
- delete_user = "Get Rid Of",
- created_user = "So %s is this bright young talent we've been hearing about.",
- modified_user = "Whatever was wrong with %s we squared away.",
- deleted_user = "I got rid of that %s character for you.",
-
- --==[[ Archive ]]==--
-
- arc_display = "Displaying %{n_thread} expired %{p_thread} from the past %{n_day} %{p_day}",
- arc_number = "In Britan they say 'pound'.",
- arc_name = "Who?",
- arc_excerpt = "TL;DR",
- arc_replies = "Responses",
- arc_view = "Investigate",
-
- --==[[ Ban ]]==--
-
- ban_title = "Not allowed back!",
- ban_reason = "I decided I don't like you anymore, because: ",
- ban_expire = "I might forget about this on %{expire}.",
- ban_ip = "And your stupid raffle ticket was: %{ip}.",
-
- --==[[ Catalog ]]==--
-
- cat_stats = "R: %{replies} / F: %{files}",
-
- --==[[ Copyright ]]==--
-
- copy_software = "You paid HOW MUCH for %{software}? And it's only version %{version}?! We should have used phpBB, it's way more mature.",
- copy_download = "Negotiate a license from %{github}",
-
- --==[[ Forms ]]==--
-
- form_ban = "Escort Off Property",
- form_ban_display = "Not allowed in public",
- form_ban_board = "Not allowed in my hosue",
- form_ban_reason = "Why don't I like this person",
- form_ban_time = "How long (in digital ages) to pretend I don't know this guy.",
- form_clear = "Forget About It",
- form_delete = "Hide Evidence",
- form_draw = "Sketch Out",
- form_lock = "END THIS",
- form_override = "CLOUD IS LOOSE AND HUNGRY FOR DATA",
- form_readme = "Frankly, I don't read the [%{rules}] and [%{faq}] so I won't ask you to, either. Hell, I don't even know what they say. And I wrote 'em!",
- form_remix = "CLAIM AS YOUR OWN",
- form_report = "I DON'T LIKE IT",
- form_required = "MANDATORY IF YOU WANT TO KEEP WORKING HERE",
- form_save = "Fwd to Offshore Account",
- form_sticky = "IMMORTIALIZE SHAME",
- form_submit = "HEMMORAGE BRILLIANCE",
- form_submit_name = "EMPLOYEE ID NUMBER (PRE-ACQUISITION)",
- form_submit_name_help = "Who are you again? A trip-what?",
- form_submit_subject = "What Am I On About? Oh, Right.",
- form_submit_subject_help = "What I've brought you all here today to discuss",
- form_submit_options = "Stock Options",
- form_submit_options_help = "sage: Don't let anyone know you're desperate for attention.",
- form_submit_comment = "What you have to say.",
- form_submit_comment_help = "Tell us about your great idea.",
- form_submit_file = "DATUMS",
- form_submit_file_help = "FOREFIT YOUR DATA TO THE CLOUD",
- form_submit_draw = "MSPAINT",
- form_submit_draw_help = "MSPAINT OR GIMPIFY",
- form_submit_spoiler = "Paywalled Content",
- form_submit_spoiler_help = "Increase viewer engagement 10%%",
- form_submit_mod = "Enforcer of Marketability",
- form_submit_mod_help = "Mark as landmine. Minesweeper humor. It means I think there's a bomb here.",
- form_width = "Digital Horizon",
- form_height = "Digital Embiggenment",
-
- --==[[ Posts ]]==--
-
- post_link = "FORWARD THIS EMAIL",
- post_lock = "EMAIL IS IN ARCHIVE MODE, STOP REPLYING TO THINGS I FORGOT ABOUT.",
- post_hidden = "%{n_post} %{p_post} and %{n_file} %{p_file} omitted. %{click} to view.",
- post_override = "CLOUD STORAGE ENABLED",
- post_reply = "Reply to this email",
- post_sticky = "reply-all'd, cc'd the company, 10/10",
- post_save = "I refuse to cut down on the fat, on account of all the words I said being fluff meant to distract you.",
-
- --==[[ Plurals ]]==--
-
- days = {
- one = "digital age",
- other = "digital aegis"
- },
- files = {
- one = "datum",
- other = "datums"
- },
- posts = {
- one = "email",
- other = "emailadoodles"
- },
- threads = {
- one = "email chain",
- other = "clusterfuck"
- },
-}}
diff --git a/misc/website/backend/app/src/locale/pl.lua b/misc/website/backend/app/src/locale/pl.lua
deleted file mode 100755
index bdadaf3..0000000
--- a/misc/website/backend/app/src/locale/pl.lua
+++ /dev/null
@@ -1,240 +0,0 @@
-return { pl = {
-
- --==[[ Navigation ]]==--
-
- archive = "Archiwum",
- bottom = "Przewiń na dół",
- catalog = "Katalog",
- index = "Spis treści",
- refresh = "Odśwież",
- ["return"] = "Powróć",
- return_board = "Powróć do boardu",
- return_index = "Powróć do spisu treści",
- return_thread = "Powróć do wątku",
- top = "Przewiń na górę",
-
- --==[[ Error Messages ]]==--
-
- -- Controller error messages
- err_ban_reason = "Brak powodu.",
- err_board_used = "Nazwa boardu jest już w użyciu.",
- err_not_admin = "Nie jesteś administratorem.",
- err_orphaned = "Wątek %s został osierocony.",
- err_slug_used = "Adres slug jest już w użyciu.",
- err_user_used = "Nazwa użytkownika jest już w użyciu.",
-
- -- Model error messages
- err_contribute = "Musisz załączyć treść posta lub załącznik.",
- err_locked_thread = "Wątek %s jest zablokowany.",
- err_no_files = "Dodawanie plików jest wyłączone na tym boardzie.",
-
- err_comment_post = "Na tym boardzie, by odpowiedzieć na wątek, musisz zamieścić komentarz.",
- err_comment_thread = "Na tym boardzie, by stworzyć wątek, musisz zamieścić komentarz.",
-
- err_create_ann = "Nie można utworzyć ogłoszenia: %s.",
- err_create_ban = "Nie można zbananować IP: %s.",
- err_create_board = "Nie można utworzyć boarda: /%s/ - %s.",
- err_create_page = "Nie można utworzyć strony: /%s/ - %s.",
- err_create_post = "Nie można wysłać posta.",
- err_create_report = "Nie można zgłosić posta %s.",
- err_create_thread = "Nie można utworzyć wątku.",
-
- err_delete_board = "Nie można usunąć boarda: /%s/ - %s.",
- err_delete_post = "Nie można usunąć posta %s.",
- err_create_user = "Nie można utworzyć użytkownika: %s.",
-
- err_file_exists = "Ten plik już istnieje na tym boardzie.",
- err_file_limit = "Wątek %s osiągnął już swój limit plików.",
- err_file_post = "Na tym boardzie, by odpowiedzieć na wątek, musisz załączyć plik.",
- err_file_thread = "Na tym boardzie, by stworzyć wątek, musisz załączyć plik.",
-
- err_invalid_board = "Nieznany board: /%s/.",
- err_invalid_ext = "Nieznany typ pliku: %s.",
- err_invalid_image = "Załączony plik nie jest prawidłowym obrazkiem.",
- err_invalid_post = "Post %s nie jest poprawnym postem.",
- err_invalid_user = "Niepoprawna nazwa użytkownika lub hasło.",
-
- --==[[ 404 ]]==--
-
- ["404"] = "404 - Strona nie znaleziona",
-
- --==[[ Administration ]]==--
-
- -- General
- admin_panel = "Panel cwela",
- administrator = "Cwel",
- announcement = "Ogłoszenie",
- archive_days = "Dni do archiwizowania wątków",
- archive_pruned = "Archiwizuj wątki",
- board = "Board",
- board_group = "Grupa boarda",
- board_title = "Nazwa boarda",
- bump_limit = "Limit przyjebek",
- content_md = "Opis (Markdown)",
- default_name = "Domyślna nazwa",
- draw_board = "Board do rysowania",
- file = "Plik",
- file_limit = "Limit plików w wątku",
- global = "Globalnie",
- index_boards = "Aktualne boardy",
- janitor = "Woźny",
- login = "Zaloguj",
- logout = "Wyloguj",
- moderator = "Moderator",
- num_pages = "Aktywne strony",
- num_threads = "Fredy na stronę",
- password = "Hasło",
- password_old = "Powtórz hasło",
- password_retype = "Stare hasło",
- post_comment_required = "Wymagany komentarz do posta",
- post_file_required = "Wymagany plik do posta",
- regen_thumb = "Odśwież miniaturki",
- reply = "Odpowiedz",
- rules = "Zasady",
- name = "Nazwa",
- subtext = "Podtekst",
- success = "Sukces",
- text_board = "Board tekstowy",
- theme = "Motyw",
- thread_comment_required = "Wymagany komentarz do freda",
- thread_file_required = "Wymagany plik do freda",
- slug = "Slug",
- username = "Nazwa użytkownika",
- yes = "Tak",
- no = "Nie",
-
- -- Announcements
- create_ann = "Utwórz ogłoszenie",
- modify_ann = "Zmień ogłoszenie",
- delete_ann = "Wyjeb ogłoszenie",
- created_ann = "Utworzyłeś ogłoszenie %s.",
- modified_ann = "Zmieniłeś ogłoszenie %s.",
- deleted_ann = "Wyjebałeś ogłoszenie %s.",
-
- -- Boards
- create_board = "Utwórz boarda",
- modify_board = "Zmień boarda",
- delete_board = "Wyjeb boarda",
- created_board = "Utworzyłeś boarda /%s/ - %s.",
- modified_board = "Zmieniłeś boarda /%s/ - %s.",
- deleted_board = "Wyjebałeś boarda /%s/ - %s.",
-
- -- Pages
- create_page = "Utwórz stronę",
- modify_page = "Zmień stronę",
- delete_page = "Wyjeb stronę",
- created_page = "Utworzyłeś stronę /%s/ - %s.",
- modified_page = "Zmieniłeś stronę /%s/ - %s.",
- deleted_page = "Wyjebałeś stronę /%s/ - %s.",
-
- -- Reports
- view_report = "Przejrzyj zgłoszenie",
- delete_report = "Usuń zgłoszenie",
- deleted_report = "Wyjebałeś zgłoszenie %s.",
-
- -- Users
- create_user = "Utwórz użytkownika",
- modify_user = "Zmień użytkownika",
- delete_user = "Wyjeb użytkownika",
- created_user = "Utworzyłeś użytkownika %s.",
- modified_user = "Zmieniłeś użytkownika %s.",
- deleted_user = "Wyjebałeś użytkownika %s.",
-
- --==[[ Archive ]]==--
-
- arc_display = "Wyświetlanie %{n_thread} %{p_thread} (zarchiwizowane) z %{n_day} %{p_day}",
- arc_number = "nr ",
- arc_name = "Nazwa",
- arc_excerpt = "Kawał freda",
- arc_replies = "Odpowiedzi",
- arc_view = "Wyślij",
-
- --==[[ Ban ]]==--
-
- ban_title = "Zbanowany!",
- ban_reason = "Zostałeś zbananowany z powodu o takiego:",
- ban_expire = "Twój banan usunie się %{expire}.",
- ban_ip = "Według naszych serwerów NASA, twoje IP to %{ip}.",
-
- --==[[ Catalog ]]==--
-
- cat_stats = "Odp.: %{replies} / plików: %{files}",
-
- --==[[ Copyright ]]==--
-
- copy_software = "Fredy napędzane przez %{software} %{version}",
- copy_download = "Pobierz z %{github}",
-
- --==[[ Forms ]]==--
-
- form_ban = "Zbanuj użytkownika",
- form_ban_display = "Wyświetl bana",
- form_ban_board = "Ban lokalny",
- form_ban_reason = "Powód bana",
- form_ban_time = "Długość bana (w minutach)",
- form_clear = "Wyczyść",
- form_delete = "Usuń posta",
- form_draw = "Rysuj",
- form_lock = "Zablokuj wątek",
- form_override = "Nielimitowane pliki",
- form_readme = "Przeczytaj [%{rules}] oraz [%{faq}] zanim zapostujesz.",
- form_remix = "Przerób obrazek",
- form_report = "Zgłoś posta",
- form_required = "pole wymagane",
- form_save = "Zapisz wątek",
- form_sticky = "Przyklej freda",
- form_submit = "Wyślij posta",
- form_submit_name = "Pseudonim",
- form_submit_name_help = "Nadaj sobie nazwę lub tripkod (opcjonalne)",
- form_submit_subject = "Temat",
- form_submit_subject_help = "Temat dyskusji (opcjonalne)",
- form_submit_options = "Opcje",
- form_submit_options_help = "sage: zapostuj bez podbijania freda (opcjonalne)",
- form_submit_comment = "Komentarz",
- form_submit_comment_help = "Dodaj coś do dyskusji",
- form_submit_file = "Plik",
- form_submit_file_help = "Załącz plik",
- form_submit_draw = "Rysuj",
- form_submit_draw_help = "Narysuj lub przerób obrazek",
- form_submit_spoiler = "Spoiler",
- form_submit_spoiler_help = "Podmień miniaturkę na spoiler",
- form_submit_mod = "Moderator",
- form_submit_mod_help = "Oznacz tego freda",
- form_width = "Szerokość",
- form_height = "Wysokość",
-
- --==[[ Posts ]]==--
-
- post_link = "Link do tego posta",
- post_lock = "Wątek jest zablokowany",
- post_hidden = "%{n_post} %{p_post} i %{n_file} %{p_file} zostały pominięte. %{click} aby wyświetlić.",
- post_override = "Wątek akceptuje nielimitowaną ilość plików",
- post_reply = "Odpowiedz na ten post",
- post_sticky = "Fred jest przyklejony",
- post_save = "Wątek nie będzie archiwizowany",
-
- --==[[ Plurals ]]==--
-
- days = {
- one = "dzień",
- other = "dni"
- },
- files = {
- one = "plik",
- few = "pliki",
- many = "plików",
- other = "pliki"
- },
- posts = {
- one = "post",
- few = "posty",
- many = "postów",
- other = "posty"
- },
- threads = {
- one = "wątek",
- few = "wątki",
- many = "wątków",
- other = "wątki"
- },
-}}
diff --git a/misc/website/backend/app/src/models/announcements.lua b/misc/website/backend/app/src/models/announcements.lua
deleted file mode 100755
index 35c9fbf..0000000
--- a/misc/website/backend/app/src/models/announcements.lua
+++ /dev/null
@@ -1,96 +0,0 @@
-local Model = require("lapis.db.model").Model
-local Announcements = Model:extend("announcements", {
- relations = {
- { "board", belongs_to="Boards" }
- }
-})
-
-Announcements.valid_record = {
- { "board_id", is_integer=true },
- { "text", exists=true }
-}
-
---- Create an announcement
--- @tparam table params Announcement parameters
--- @treturn boolean success
--- @treturn string error
-function Announcements:new(params)
- local announcement = self:create(params)
- return announcement and announcement or nil, { "err_create_ann", { params.text } }
-end
-
---- Modify an announcement
--- @tparam table params Announcement parameters
--- @treturn boolean success
--- @treturn string error
-function Announcements:modify(params)
- local announcement = self:get(params.id)
- if not announcement then
- return nil, { "err_create_ann", { params.text } } -- FIXME: wrong error
- end
-
- local success, err = announcement:update(params)
- return success and announcement or nil, "FIXME: " .. tostring(err)
-end
-
---- Delete an announcement
--- @tparam number id Announcement ID
--- @treturn boolean success
--- @treturn string error
-function Announcements:delete(id)
- local announcement = self:get(id)
- if not announcement then
- return nil, "FIXME"
- end
-
- local success = announcement:delete()
- return success and announcement or nil, "FIXME"
-end
-
---- Get all announcements
--- @treturn boolean success
--- @treturn string error
-function Announcements:get_all()
- local announcements = self:select("order by board_id asc")
- return announcements
-end
-
---- Get announcements
--- @treturn boolean success
--- @treturn string error
-function Announcements:get_global()
- local announcements = self:select("where board_id=0")
- return announcements
-end
-
---- Get board announcements
--- @tparam number board_id Board ID
--- @treturn boolean success
--- @treturn string error
-function Announcements:get_board(board_id)
- local announcements = self:select("where board_id=?", board_id)
- return announcements
-end
-
---- Get announcement
--- @tparam number id Announcement ID
--- @treturn boolean success
--- @treturn string error
-function Announcements:get(id)
- local announcement = self:find(id)
- return announcement and announcement or nil, "FIXME"
-end
-
-function Announcements.format_to_db(_, params)
- if not params.board_id then
- params.board_id = 0
- end
-end
-
-function Announcements.format_from_db(_, params)
- if params.board_id == 0 then
- params.board_id = nil
- end
-end
-
-return Announcements
diff --git a/misc/website/backend/app/src/models/bans.lua b/misc/website/backend/app/src/models/bans.lua
index 66e6c8f..7d6cd68 100755
--- a/misc/website/backend/app/src/models/bans.lua
+++ b/misc/website/backend/app/src/models/bans.lua
@@ -1,151 +1,23 @@
-local Model = require("lapis.db.model").Model
-local Bans = Model:extend("bans", {
- relations = {
- { "board", belongs_to="Boards" },
- }
-})
-
-Bans.valid_record = {
- { "board_id", is_integer=true },
- { "ip", max_length=255, exists=true },
- { "time", exists=true }
-}
-
---- Create a ban
--- @tparam table params Ban parameters
--- @treturn boolean success
--- @treturn string err
-function Bans:new(params)
- local ban = self:create(params)
- return ban and ban or nil, { "err_create_ban", { params.ip } }
-end
-
---- Modify a ban
--- @tparam table params Board parameters
--- @treturn boolean success
--- @treturn string error
-function Bans:modify(params)
- local ban = self:get(params.id)
- if not ban then
- return nil, { "err_create_board", { params.name, params.title } } -- FIXME: wrong error message
- end
-
- local success, err = ban:update(params)
- return success and ban or nil, "FIXME: " .. tostring(err)
-end
-
---- Delete a ban
--- @tparam number id Ban's ID
--- @treturn boolean success
--- @treturn string err
-function Bans:delete(id)
- local ban = self:get(id)
- if not ban then
- return nil, "FIXME"
- end
-
- local success = ban:delete()
- return success and ban or nil, "FIXME"
-end
-
---- Get all bans
--- @treturn table users List of bans
-function Bans:get_all()
- local bans = self:select("order by board_id asc, time + duration desc, ip asc")
-
- for i=#bans, 1, -1 do
- local ban = bans[i]
- if not self:validate(ban) then
- table.remove(bans, i)
- end
- end
-
- return bans
-end
-
---- Get board bans
--- @treturn table users List of bans
-function Bans:get_board(board_id)
- local bans = self:select("where board_id=? order by board_id asc, time + duration desc, ip asc", board_id)
-
- for i=#bans, 1, -1 do
- local ban = bans[i]
- if not self:validate(ban) then
- table.remove(bans, i)
- end
- end
-
- return bans
-end
-
---- Get ban data
--- @tparam number id Ban's ID
--- @treturn table ban
-function Bans:get(id)
- local ban = self:find(id)
- if not ban then
- return nil, "FIXME: ALART!"
- end
-
- local valid, err = self:validate(ban)
- if not valid then
- return nil, err
- end
-
- return ban
-end
-
---- Get bans for specific ip
--- @tparam string ip IP address
--- @treturn table ban
-function Bans:get_ip(ip)
- local bans = self:select("where ip=?", ip)
-
- for i=#bans, 1, -1 do
- local ban = bans[i]
- if not self:validate(ban) then
- table.remove(bans, i)
- end
- end
-
- return bans
-end
-
---- Validate ban
--- @tparam table ban Ban data
--- @treturn boolean valid
-function Bans:validate(ban)
- local time = os.time()
- local finish = ban.time + ban.duration
-
- if time >= finish then
- self:delete(ban)
- return nil, "FIXME: ban has exired"
- end
-
- return true
-end
-
---- Format ban paramaters for DB insertion
--- @tparam table params Ban parameters
-function Bans.format_to_db(_, params)
- -- Convert duration from days to seconds
- params.duration = (tonumber(params.duration) or 0) * 86400
-
- if not params.board_id then
- params.board_id = 0
- end
-end
-
---- Format ban parameters for User consumption
--- @tparam table params Ban parameters
-function Bans.format_from_db(_, params)
- -- Convert duration from seconds to days
- params.duration = tonumber(params.duration) / 86400
-
- if params.board_id == 0 then
- params.board_id = nil
- end
-end
-
-return Bans
+local lapis = require "lapis"
+local capture = require("lapis.application").capture_errors_json
+local r2 = require("lapis.application").respond_to
+local handle = require("utils.error").handle
+local app = lapis.Application()
+app.__base = app
+app.name = "api.bans."
+app.path = "/api/bans"
+
+app:match("bans", "", capture({
+ on_error = handle,
+ r2(require "apps.api.bans.bans"),
+}))
+app:match("ban", "/:uri_ban[%d]", capture({
+ on_error = handle,
+ r2(require "apps.api.bans.ban"),
+}))
+app:match("bans_ip", "/ip/:uri_ip", capture({
+ on_error = handle,
+ r2(require "apps.api.bans.bans_ip"),
+}))
+
+return app
diff --git a/misc/website/backend/app/src/models/boards.lua b/misc/website/backend/app/src/models/boards.lua
deleted file mode 100755
index 46ee3ce..0000000
--- a/misc/website/backend/app/src/models/boards.lua
+++ /dev/null
@@ -1,226 +0,0 @@
-local db = require "lapis.db"
-local giflib = require "giflib"
-local lfs = require "lfs"
-local magick = require "magick"
-local Model = require("lapis.db.model").Model
-local Boards = Model:extend("boards", {
- relations = {
- { "announcements", has_many="Announcements" },
- { "bans", has_many="Bans" },
- { "posts", has_many="Posts" },
- { "reports", has_many="Reports" },
- { "threads", has_many="Threads", where={ archive=false }, order="sticky desc, last_active desc" },
- { "archived", has_many="Threads", where={ archive=true }, order="last_active desc" },
- }
-})
-
-Boards.valid_record = {
- { "name", max_length=255, exists=true },
- { "title", max_length=255, exists=true },
- { "subtext", max_length=255 },
- { "ban_message", max_length=255 },
- { "anon_name", max_length=255 },
- { "theme", max_length=255 },
- { "pages", exists=true },
- { "threads_per_page", exists=true },
- { "thread_file_limit", exists=true },
- { "post_limit", exists=true },
- { "archive_time", exists=true },
- { "group", exists=true }
-}
-
---- Create a board
--- @tparam table params Board parameters
--- @treturn boolean success
--- @treturn string error
-function Boards:new(params)
- local board = self:create(params)
- if not board then
- return false, { "err_create_board", { params.name, params.title } }
- end
-
- lfs.mkdir(string.format("./static/%s/", board.name))
- return board
-end
-
---- Modify a board
--- @tparam table params Board parameters
--- @tparam old_name Board's current short name
--- @treturn boolean success
--- @treturn string error
-function Boards:modify(params, old_name)
- local board = self:get(old_name)
- if not board then
- return false, { "err_create_board", { params.name, params.title } } -- FIXME: wrong error message
- end
-
- local success, err = board:update(params)
- if not success then
- return false, "FIXME: " .. tostring(err)
- end
-
- if board.name ~= old_name then
- local old = string.format("./static/%s/", old_name)
- local new = string.format("./static/%s/", board.name)
- os.rename(old, new)
- end
-
- return board
-end
-
---- Delete a board
--- @tparam string name Board's short name
--- @treturn boolean success
--- @treturn string error
-function Boards:delete(name)
- local board = self:get(name)
- if not board then
- return false, { "err_create_board", { name, name } } -- FIXME: wrong error message
- end
-
- local announcements = board:get_announcements()
- local bans = board:get_bans()
- local posts = board:get_posts()
- local reports = board:get_reports()
- local threads = board:get_threads()
- local dir = string.format("./static/%s/", board.name)
-
- -- Clear data
- for _, announcement in ipairs(announcements) do announcement:delete() end
- for _, ban in ipairs(bans) do ban:delete() end
- for _, post in ipairs(posts) do post:delete() end
- for _, report in ipairs(reports) do report:delete() end
- for _, thread in ipairs(threads) do thread:delete() end
-
- -- Clear filesystem
- if lfs.attributes(dir, "mode") == "directory" then
- -- Delete files
- for file in lfs.dir(dir) do
- os.remove(dir .. file)
- end
-
- -- Delete directory
- lfs.rmdir(dir)
- end
-
- -- Clear board
- local success = board:delete()
- return success and board or false, { "err_delete_board", { board.name, board.title } }
-end
-
---- Get all boards
--- @treturn table boards
-function Boards:get_all()
- local boards = self:select("order by boards.group asc, name asc")
- return boards and boards or false, "FIXME: ALART!"
-end
-
---- Get board data
--- @tparam string name Board's short name
--- @treturn table board
-function Boards:get(name)
- local board = self:find { name=name }
- return board and board or false, "FIXME: ALART!"
-end
-
---- Format board paramaters for DB insertion
--- @tparam table params Board parameters
-function Boards.format_to_db(_, params)
- -- Convert archive_time from days to seconds
- params.archive_time = (tonumber(params.archive_time) or 0) * 86400
-end
-
---- Format board parameters for User consumption
--- @tparam table params Board parameters
-function Boards.format_from_db(_, params)
- -- Convert archive_time from seconds to days
- params.archive_time = tonumber(params.archive_time) / 86400
-end
-
---- Regenerate thumbnails for all posts
--- @treturn none
-function Boards.regen_thumbs(_)
- local sql = [[
- select
- boards.name as board,
- posts.thread_id,
- posts.file_path,
- posts.file_width,
- posts.file_height,
- posts.file_type
- from posts
- left join boards on
- board_id = boards.id
- where
- file_path is not null and
- file_width is not null and
- file_height is not null and
- file_type = 'image' and
- file_spoiler = false
- order by
- board_id asc,
- thread_id asc,
- post_id asc
- ]]
- local dir
- local board
- local thread = 0
- local results = db.query(sql)
-
- for _, result in ipairs(results) do
- -- Change board, reset thread counter and image directory
- if result.board ~= board then
- board = result.board
- thread = 0
- dir = string.format("./static/%s/", board)
- end
-
- -- Filesystem paths
- local name, ext = result.file_path:match("^(.+)(%..+)$")
- ext = string.lower(ext)
-
- local full_path = dir .. result.file_path
- local thumb_path = dir .. "s" .. result.file_path
-
- -- Generate a thumbnail
- if ext == ".webm" then
- thumb_path = dir .. "s" .. name .. ".png"
-
- -- Create screenshot of first frame
- os.execute(string.format("ffmpeg -i %s -ss 00:00:01 -vframes 1 %s -y", full_path, thumb_path))
- end
-
- -- Save thumbnail
- local w, h
- if result.thread_id > thread then
- thread = result.thread_id
- w = result.file_width < 250 and result.file_width or 250
- h = result.file_height < 250 and result.file_height or 250
- else
- w = result.file_width < 125 and result.file_width or 125
- h = result.file_height < 125 and result.file_height or 125
- end
-
- -- Grab first frame from video
- if ext == ".webm" then
- magick.thumb(thumb_path, string.format("%sx%s", w, h), thumb_path)
- elseif ext == ".svg" then
- thumb_path = dir .. "s" .. name .. ".png"
- os.execute(string.format("convert -background none -resize %dx%d %s %s", w, h, full_path, thumb_path))
- elseif ext == ".gif" then
- -- Grab first frame of a gif instead of the last
- local gif, err = giflib.load_gif(full_path)
-
- if err then
- magick.thumb(full_path, string.format("%sx%s", w, h), thumb_path)
- else
- gif:write_first_frame(thumb_path)
- magick.thumb(thumb_path, string.format("%sx%s", w, h), thumb_path)
- end
- else
- magick.thumb(full_path, string.format("%sx%s", w, h), thumb_path)
- end
- end
-end
-
-return Boards
diff --git a/misc/website/backend/app/src/models/pages.lua b/misc/website/backend/app/src/models/pages.lua
deleted file mode 100755
index 82ce112..0000000
--- a/misc/website/backend/app/src/models/pages.lua
+++ /dev/null
@@ -1,90 +0,0 @@
-local Model = require("lapis.db.model").Model
-local Pages = Model:extend("pages")
-
-Pages.valid_record = {
- { "slug", exists=true, type="String" },
- { "title", exists=true, type="String" },
- { "content", exists=true, type="String" }
-}
-
---- Create a new page
--- @tparam table page Page data
--- @treturn boolean success
--- @treturn string error
-function Pages:new(params)
- local unique, err = self:is_unique(params.slug, params.title)
- if not unique then
- return nil, err
- end
-
- local page = self:create(params)
- return page and page or nil, { "err_create_page", { page.slug, page.title } }
-end
-
---- Modify a page
--- @tparam table page Page data
--- @treturn boolean success
--- @treturn string error
-function Pages:modify(params, slug)
- local page = self:get(slug)
- if not page then
- return nil, "FIXME"
- end
-
- -- Check to see if the page we are modifying is the one that fails validation.
- -- If it is, that's fine since we're updating the unique values with themselves.
- -- If #pages > 1 then this will always fail since either the new slug or new
- -- title is going to belong to some other page.
- do
- local unique, err, pages = self:is_unique(params.slug, params.title)
- if not unique then
- for _, p in ipairs(pages) do
- if page.id ~= p.id then
- return nil, err
- end
- end
- end
- end
-
- local success, err = page:update(params)
- return success and page or nil, "FIXME: " .. tostring(err)
-end
-
---- Delete page
--- @tparam table page Page data
--- @treturn boolean success
--- @treturn string error
-function Pages:delete(slug)
- local page = self:get(slug)
- if not page then
- return nil, "FIXME"
- end
-
- local success = page:delete()
- return success and page or nil, "FIXME"
-end
-
---- Get all pages
--- @treturn table pages List of pages
-function Pages:get_all()
- return self:select("order by slug asc")
-end
-
---- Get page
--- @tparam string slug Page slug
--- @treturn table page
-function Pages:get(slug)
- local page = self:find { slug=slug:lower() }
- return page and page or nil, "FIXME"
-end
-
-function Pages:is_unique(slug, title)
- local pages = self:select("where slug=? or lower(title)=?", slug, title:lower())
- return #pages == 0 and true or nil, "FIXME", pages
-end
-
-function Pages.format_to_db(_, params)
- params.slug = params.slug:lower()
-end
-
-return Pages
diff --git a/misc/website/backend/app/src/models/posts.lua b/misc/website/backend/app/src/models/posts.lua
deleted file mode 100755
index e53d792..0000000
--- a/misc/website/backend/app/src/models/posts.lua
+++ /dev/null
@@ -1,387 +0,0 @@
-local encoding = require "lapis.util.encoding"
-local Model = require("lapis.db.model").Model
-local giflib = require "giflib"
-local magick = require "magick"
-local md5 = require "md5"
-local filetypes = require "utils.file_whitelist"
-local generate = require "utils.generate"
-local Posts = Model:extend("posts", {
- relations = {
- { "board", belongs_to="Boards" },
- { "thread", belongs_to="Threads" },
- }
-})
-local sf = string.format
-
-local function get_duration(path)
- local cmd = sf("ffprobe -i %s -show_entries format=duration -v quiet -of csv=\"p=0\" -sexagesimal", path)
- local f = io.popen(cmd, "r")
- local s = f:read("*a")
- f:close()
-
- local hr, mn, sc = string.match(s, "(%d+):(%d+):(%d+).%d+")
- local d = mn..":"..sc
-
- if hr ~= "0" then
- d = hr..":"..d
- end
-
- return d
-end
-
---- Prepare post for insertion
--- @tparam table params Input from the user
--- @tparam table session User session
--- @tparam table board Board data
--- @tparam table thread Thread data
--- @tparam number files Number of files in thread
--- @treturn boolean success
--- @treturn string error
-function Posts:prepare_post(params, session, board, thread, files)
- -- FIXME: this whole function should be web-side, not api-side
- local time = os.time()
-
- -- Prepare session stuff
- session.password = session.password or generate.password(time)
-
- -- Save names on individual boards
- -- TODO: Put this code elsewhere
- if params.name then
- session.names[board.name] = params.name
- end
-
- -- Files take presidence over drawings, but if there is no file, fill in
- -- the file fields with draw data. This should avoid ugly code branching
- -- later on in the file.
- -- TODO: send file data through api!
- params.file = params.file or {
- filename = "",
- content = ""
- }
-
- if #params.file.content == 0 and params.draw then
- local pattern = ".-,(.+)"
- params.draw = params.draw:match(pattern)
- params.file.filename = "tegaki.png"
- params.file.content = encoding.decode_base64(params.draw)
- end
-
- -- Check board flags
- if thread then
- if thread.lock and not session.admin and not session.mod then
- return false, { "err_locked_thread", { thread.post_id } }
- end
-
- if board.post_comment and not params.comment then
- return false, { "err_comment_post" }
- end
-
- if board.post_file and #params.file.content == 0 then
- return false, { "err_file_post" }
- end
- else
- if board.thread_comment and not params.comment then
- return false, { "err_comment_thread" }
- end
-
- if board.thread_file and #params.file.content == 0 then
- return false, { "err_file_thread" }
- end
- end
-
- -- Parse name
- if params.name then
- params.name, params.trip = generate.tripcode(params.name)
- end
-
- -- Set file
- if #params.file.content > 0 then
-
- -- Reject files in text-only boards
- if board.text_only then
- return false, { "err_no_files" }
- end
-
- -- Thread limit is already met.
- if thread then
- if files >= board.thread_file_limit and not thread.size_override then
- return false, { "err_file_limit", { thread.post_id } }
- end
- end
-
- local name = sf("%s%s", time, generate.random())
- local ext = params.file.filename:match("^.+(%..+)$")
- ext = string.lower(ext)
-
- -- Figure out how to deal with the file
- if filetypes.image[ext] and board.filetype_image then
- params.file_type = "image"
-
- if ext ~= ".webm" then
- -- Check if valid image
- local image = magick.load_image_from_blob(params.file.content)
-
- if not image then
- return false, { "err_invalid_image" }
- end
-
- params.file_width = image:get_width()
- params.file_height = image:get_height()
- end
- elseif filetypes.audio[ext] and board.filetype_audio then
- params.file_type = "audio"
- else
- return false, { "err_invalid_ext", { ext } }
- end
-
- params.file_name = params.file.filename
- params.file_path = name .. ext
- params.file_md5 = md5.sumhexa(params.file.content)
- params.file_size = #params.file.content
-
- if params.file_spoiler then
- params.file_spoiler = true
- else
- params.file_spoiler = false
- end
-
- -- Check if file already exists
- local file = self:find_file(board.id, params.file_md5)
- if file then
- return false, { "err_file_exists" }
- end
- else
- params.file_spoiler = false
- end
-
- -- Check contributions
- if not params.comment and not params.file_name then
- return false, { "err_contribute" }
- end
-
- return true
-end
-
---- Create a new post
--- @tparam table params Post parameters
--- @tparam table board Board data
--- @tparam boolean op OP flag
--- @treturn boolean success
--- @treturn string error
-function Posts:new(params, board, op)
-
- -- Create post
- local post = self:create(params)
- if not post then
- return false, { "err_create_post" }
- end
-
- -- Save file
- if post.file_path then
- local dir = sf("./static/%s/", board.name)
- local name, ext = post.file_path:match("^(.+)%.(.+)$")
- ext = string.lower(ext)
-
- -- Filesystem paths
- local full_path = dir .. post.file_path
- local thumb_path = dir .. "s" .. post.file_path
-
- -- Save file
- local file = io.open(full_path, "w")
- file:write(params.file_content)
- file:close()
-
- -- Audio file
- if post.file_type == "audio" then
- post.file_duration = get_duration(full_path)
- post:update("file_duration")
- return post
- end
-
- -- Image file
- if post.file_type == "image" and not post.file_spoiler then
-
- -- Save thumbnail
- local w, h
- if op then
- w = post.file_width < 250 and post.file_width or 250
- h = post.file_height < 250 and post.file_height or 250
- else
- w = post.file_width < 125 and post.file_width or 125
- h = post.file_height < 125 and post.file_height or 125
- end
-
- -- Generate a thumbnail
- if ext == "webm" then
- thumb_path = dir .. "s" .. name .. ".png"
-
- -- Create screenshot of first frame
- os.execute(sf("ffmpeg -i %s -ss 00:00:01 -vframes 1 %s -y", full_path, thumb_path))
-
- -- Update post info
- local image = magick.load_image(thumb_path)
- post.file_width = image:get_width()
- post.file_height = image:get_height()
- post.file_duration = get_duration(full_path)
- post:update("file_width", "file_height", "file_duration")
-
- -- Resize thumbnail
- magick.thumb(thumb_path, sf("%sx%s", w, h), thumb_path)
-
- elseif ext == "svg" then
- thumb_path = dir .. "s" .. name .. ".png"
- os.execute(sf("convert -background none -resize %dx%d %s %s", w, h, full_path, thumb_path))
-
- elseif ext == "gif" then
- local gif, err = giflib.load_gif(full_path)
-
- if err then
- -- Not animated I presume? TODO: check what err represents
- magick.thumb(full_path, sf("%sx%s", w, h), thumb_path)
- else
- -- Grab first frame of a gif instead of the last
- gif:write_first_frame(thumb_path)
-
- -- Update post info
- local width, height = gif:dimensions()
- post.file_width = width
- post.file_height = height
- post:update("file_width", "file_height")
-
- -- Resize thumbnail
- magick.thumb(thumb_path, sf("%sx%s", w, h), thumb_path)
- end
- else
- magick.thumb(full_path, sf("%sx%s", w, h), thumb_path)
- end
- end
- end
-
- -- Update board
- board:update("total_posts")
-
- return post
-end
-
---- Delete post data
--- @tparam number id Post ID
--- @treturn boolean success
--- @treturn string error
-function Posts:delete(id)
-
- -- Get post
- local post, err = self:get_post_by_id(id)
- if not post then
- return false, err
- end
-
- -- Delete post
- local success, err = post:delete()
- if not success then
- return false, err--{ "err_delete_post", { post.post_id } }
- end
-
- -- Delete files
- if post.file_path then
- local board = post:get_board()
- local dir = sf("./static/%s/", board.name)
- local name, ext = post.file_path:match("^(.+)%.(.+)$")
- ext = string.lower(ext)
- os.remove(dir .. post.file_path)
-
- -- Change thumbnail path to png
- if ext == "webm" or ext == "svg" then
- post.file_path = name .. ".png"
- end
-
- os.remove(dir .. "s" .. post.file_path)
- end
-
- return post
-end
-
---- Get op and last 5 posts of a thread to display on board index
--- @tparam number thread_id Thread ID
--- @treturn table posts
-function Posts:get_index_posts(thread_id)
- local sql = "where thread_id=? order by post_id desc limit 5"
- local posts = self:select(sql, thread_id)
-
- if self:count_posts(thread_id) > 5 then
- local thread = posts[1]:get_thread()
- local op = thread:get_op()
- table.insert(posts, op)
- end
-
- return posts
-end
-
---- Get post data
--- @tparam number board_id Board ID
--- @tparam number post_id Local Post ID
--- @treturn table post
-function Posts:get(board_id, post_id)
- local post = self:find {
- board_id = board_id,
- post_id = post_id
- }
- return post and post or false, "FIXME"
-end
-
---- Get post data
--- @tparam number id Post ID
--- @treturn table post
-function Posts:get_post_by_id(id)
- local post = self:find(id)
- return post and post or false, "FIXME"
-end
-
---- Find file in active posts
--- @tparam number board Board ID
--- @tparam string file_md5 Unique hash of file
--- @treturn boolean success
--- @treturn string error
-function Posts:find_file(board_id, file_md5)
- local sql = "where board_id=? and file_md5=? limit 1"
- return unpack(self:select(sql, board_id, file_md5))
-end
-
-
---- Count hidden posts in a thread
--- @tparam number thread_id Thread ID
--- @treturn table hidden
-function Posts:count_hidden_posts(thread_id)
- local posts = self:get_index_posts(thread_id)
- local num_posts = self:count_posts(thread_id)
- local num_files = self:count_files(thread_id)
-
- for _, post in ipairs(posts) do
- -- Reduce number of posts hidden
- num_posts = num_posts - 1
-
- -- Reduce number of files hidden
- if post.file_name then
- num_files = num_files - 1
- end
- end
-
- return { posts=num_posts, files=num_files }
-end
-
---- Count posts in a thread
--- @tparam number thread_id Thread ID
--- @treturn number posts
-function Posts:count_posts(thread_id)
- local sql = "thread_id=?"
- return self:count(sql, thread_id)
-end
-
---- Count posts with images in a thread
--- @tparam number thread_id Thread ID
--- @treturn number files
-function Posts:count_files(thread_id)
- local sql = "thread_id=? and file_name is not null"
- return self:count(sql, thread_id)
-end
-
-return Posts
diff --git a/misc/website/backend/app/src/models/reports.lua b/misc/website/backend/app/src/models/reports.lua
deleted file mode 100755
index bbe1f9c..0000000
--- a/misc/website/backend/app/src/models/reports.lua
+++ /dev/null
@@ -1,76 +0,0 @@
-local trim = require("lapis.util").trim_filter
-local Model = require("lapis.db.model").Model
-local Reports = Model:extend("reports")
-
---- Create a new report
--- @tparam table report Report data
--- @treturn boolean success
--- @treturn string error
-function Reports:create_report(report)
- -- Trim white space
- trim(report, {
- "board_id", "thread_id", "post_id",
- "timestamp", "num_reports"
- }, nil)
-
- local r = self:create {
- board_id = report.board_id,
- thread_id = report.thread_id,
- post_id = report.post_id,
- timestamp = report.timestamp,
- num_reports = report.num_reports
- }
-
- if r then
- return r
- end
-
- return false, { "err_create_report" }
-end
-
---- Modify a report
--- @tparam table report Report data
--- @treturn boolean success
--- @treturn string error
-function Reports:modify_report(report)
- local columns = {}
- for col in pairs(report) do
- table.insert(columns, col)
- end
-
- return report:update(unpack(columns))
-end
-
---- Delete report
--- @tparam table report Report data
--- @treturn boolean success
--- @treturn string error
-function Reports:delete_report(report)
- return report:delete()
-end
-
---- Get all reports
--- @treturn table reports List of reports
-function Reports:get_reports()
- return self:select("order by timestamp asc")
-end
-
---- Get report
--- @tparam string board_id Board ID
--- @tparam string post_id Post ID
--- @treturn table report
-function Reports:get_report(board_id, post_id)
- return unpack(self:select(
- "where board_id=? and post_id=? limit 1",
- board_id, post_id
- ))
-end
-
---- Get report
--- @tparam string id Report ID
--- @treturn table report
-function Reports:get_report_by_id(id)
- return unpack(self:select("where id=? limit 1", id))
-end
-
-return Reports
diff --git a/misc/website/backend/app/src/models/threads.lua b/misc/website/backend/app/src/models/threads.lua
deleted file mode 100755
index d33d00a..0000000
--- a/misc/website/backend/app/src/models/threads.lua
+++ /dev/null
@@ -1,106 +0,0 @@
-local Model = require("lapis.db.model").Model
-local Threads = Model:extend("threads", {
- relations = {
- { "board", belongs_to="Boards" },
- { "posts", has_many="Posts" },
- { "op", has_one="Posts", order="post_id asc" },
- }
-})
-
-Threads.valid_record = {
- { "board_id", exists=true }
-}
-
---- Create thread
--- @tparam table params Thread parameters
--- @treturn boolean success
--- @treturn string error
-function Threads:new(params)
- local thread = self:create(params)
- return thread and thread or false, { "err_create_thread" }
-end
-
---- Modify a thread
--- @tparam table params Thread parameters
--- @treturn boolean success
--- @treturn string error
-function Threads:modify(params)
- local thread = self:get(params.id)
- if not thread then
- return false, { "err_create_board" } -- FIXME: wrong error message
- end
-
- local success, err = thread:update(params)
- return success and thread or false, "FIXME: " .. tostring(err)
-end
-
---- Delete entire thread
--- @tparam number id Thread ID
--- @treturn boolean success
--- @treturn string error
-function Threads:delete(id)
- -- FIXME: API needs to create a user object for better auth checking
- local thread, err = self:get(id)
- if not thread then
- return false, err
- end
-
- local op = thread:get_op()
- local success = thread:delete()
- return success and thread or false, { "err_delete_thread", { op.post_id } }
-end
-
---- Get thread data
--- @tparam number id Thread ID
--- @treturn table thread
-function Threads:get(id)
- local thread = self:find(id)
- return thread and thread or false, "FIXME"
-end
-
---- Get archived threads
--- @tparam number board_id Board ID
--- @treturn table threads
-function Threads:get_archived(board_id)
- local sql = "where board_id=? and archive=true order by last_active desc"
- return self:select(sql, board_id)
-end
-
---- Bump threads to archive
--- @tparam number board_id Board ID
--- @tparam number max_threads Maximum number of threads on this board
--- @treturn boolean success
--- @treturn string error
-function Threads:archive_threads(board_id, max_threads)
- local threads = self:get_threads(board_id)
-
- if #threads > max_threads then
- for i=max_threads+1, #threads do
- local _, err = self:archive_thread(threads[i])
-
- if err then
- return false, err
- end
- end
- end
-end
-
---- Archive a thread
--- @tparam table thread Thread data
--- @treturn boolean success
--- @treturn string error
-function Threads:archive_thread(thread)
- thread.sticky = false
- thread.lock = true
- thread.archive = true
- thread.last_active = os.time()
- return thread:update("sticky", "lock", "archive", "last_active")
-end
-
---- Find threads with no posts
--- @treturn table threads
-function Threads:find_orphans()
- return self:select("where id not in (select distinct thread_id from posts)")
-end
-
-return Threads
diff --git a/misc/website/backend/app/src/models/users.lua b/misc/website/backend/app/src/models/users.lua
index 469d6f2..11d5168 100755
--- a/misc/website/backend/app/src/models/users.lua
+++ b/misc/website/backend/app/src/models/users.lua
@@ -1,30 +1,34 @@
local bcrypt = require "bcrypt"
-local uuid = require "resty.jit-uuid"
+local uuid = require "resty.jit-uuid"
local config = require("lapis.config").get()
-local Model = require("lapis.db.model").Model
-local Users = Model:extend("users")
-local token = config.secret
+local Model = require("lapis.db.model").Model
+local Users = Model:extend("users")
+local token = config.secret
Users.role = {
- [-1] = "INVALID",
- [1] = "USER",
- [6] = "JANITOR",
- [7] = "MOD",
- [8] = "ADMIN",
- [9] = "OWNER",
-
- INVALID = -1,
- USER = 1,
- JANITOR = 6,
- MOD = 7,
- ADMIN = 8,
- OWNER = 9
+ [-1] = "INVALID",
+ [1] = "USER",
+ [6] = "JANITOR",
+ [7] = "MOD",
+ [8] = "ADMIN",
+ [9] = "OWNER",
+
+ INVALID = -1,
+ USER = 1,
+ JANITOR = 6,
+ MOD = 7,
+ ADMIN = 8,
+ OWNER = 9,
}
-Users.valid_record = {
- { "username", exists=true },
- { "role", exists=true, is_integer=true }
-}
+Users.valid_record = {{
+ "username",
+ exists = true,
+}, {
+ "role",
+ exists = true,
+ is_integer = true,
+}}
Users.default_key = "00000000-0000-0000-0000-000000000000"
@@ -34,31 +38,37 @@ Users.default_key = "00000000-0000-0000-0000-000000000000"
-- @treturn string error
function Users:new(params, raw_password)
- -- Check if username is unique
- do
- local unique, err = self:is_unique(params.username)
- if not unique then return nil, err end
- end
-
- -- Verify password
- do
- local valid, err = self:validate_password(params.password, params.confirm, raw_password)
- if not valid then return nil, err end
-
- params.confirm = nil
- params.password = bcrypt.digest(params.username:lower() .. params.password .. token, 12)
- end
-
- -- Generate unique API key
- do
- local api_key, err = self:generate_api_key()
- if not api_key then return nil, err end
-
- params.api_key = api_key
- end
-
- local user = self:create(params)
- return user and user or nil, { "err_create_user", { params.username } }
+ -- Check if username is unique
+ do
+ local unique, err = self:is_unique(params.username)
+ if not unique then
+ return nil, err
+ end
+ end
+
+ -- Verify password
+ do
+ local valid, err = self:validate_password(params.password, params.confirm, raw_password)
+ if not valid then
+ return nil, err
+ end
+
+ params.confirm = nil
+ params.password = bcrypt.digest(params.username:lower() .. params.password .. token, 12)
+ end
+
+ -- Generate unique API key
+ do
+ local api_key, err = self:generate_api_key()
+ if not api_key then
+ return nil, err
+ end
+
+ params.api_key = api_key
+ end
+
+ local user = self:create(params)
+ return user and user or nil, {"err_create_user", {params.username}}
end
--- Modify a user
@@ -66,34 +76,42 @@ end
-- @treturn boolean success
-- @treturn string error
function Users:modify(params, raw_username, raw_password)
- local user = self:get(raw_username)
- if not user then return nil, "FIXME" end
-
- -- Check if username is unique
- do
- local unique, err, u = self:is_unique(params.username)
- if not unique and user.id ~= u.id then return nil, err end
- end
-
- -- Verify password
- if params.password then
- local valid, err = self:validate_password(params.password, params.confirm, raw_password)
- if not valid then return nil, err end
-
- params.confirm = nil
- params.password = bcrypt.digest(params.username:lower() .. params.password .. token, 12)
- end
-
- -- Generate unique API key
- if params.api_key then
- local api_key, err = self:generate_api_key()
- if not api_key then return nil, err end
-
- params.api_key = api_key
- end
-
- local success, err = user:update(params)
- return success and user or nil, "FIXME: " .. tostring(err)
+ local user = self:get(raw_username)
+ if not user then
+ return nil, "FIXME"
+ end
+
+ -- Check if username is unique
+ do
+ local unique, err, u = self:is_unique(params.username)
+ if not unique and user.id ~= u.id then
+ return nil, err
+ end
+ end
+
+ -- Verify password
+ if params.password then
+ local valid, err = self:validate_password(params.password, params.confirm, raw_password)
+ if not valid then
+ return nil, err
+ end
+
+ params.confirm = nil
+ params.password = bcrypt.digest(params.username:lower() .. params.password .. token, 12)
+ end
+
+ -- Generate unique API key
+ if params.api_key then
+ local api_key, err = self:generate_api_key()
+ if not api_key then
+ return nil, err
+ end
+
+ params.api_key = api_key
+ end
+
+ local success, err = user:update(params)
+ return success and user or nil, "FIXME: " .. tostring(err)
end
--- Delete user
@@ -101,13 +119,13 @@ end
-- @treturn boolean success
-- @treturn string error
function Users:delete(username)
- local user = self:get(username)
- if not user then
- return nil, "FIXME"
- end
+ local user = self:get(username)
+ if not user then
+ return nil, "FIXME"
+ end
- local success = user:delete()
- return success and user or nil, "FIXME"
+ local success = user:delete()
+ return success and user or nil, "FIXME"
end
--- Verify user
@@ -115,67 +133,73 @@ end
-- @treturn boolean success
-- @treturn string error
function Users:login(params)
- local user = self:get(params.username)
- if not user then return nil, { "err_invalid_user" } end
+ local user = self:get(params.username)
+ if not user then
+ return nil, {"err_invalid_user"}
+ end
- local password = user.username .. params.password .. token
- local verified = bcrypt.verify(password, user.password)
+ local password = user.username .. params.password .. token
+ local verified = bcrypt.verify(password, user.password)
- return verified and user or nil, { "err_invalid_user" }
+ return verified and user or nil, {"err_invalid_user"}
end
--- Get all users
-- @treturn table users List of users
function Users:get_all()
- local users = self:select("order by username asc")
- return users
+ local users = self:select("order by username asc")
+ return users
end
--- Get user
-- @tparam string username Username
-- @treturn table user
function Users:get(username)
- local users = self:select("where lower(username)=? limit 1", username:lower())
- return #users == 1 and users[1] or nil, "FIXME"
+ local users = self:select("where lower(username)=? limit 1", username:lower())
+ return #users == 1 and users[1] or nil, "FIXME"
end
function Users:get_api(params)
- local user = self:find(params)
- return user and user or nil, "FIXME"
+ local user = self:find(params)
+ return user and user or nil, "FIXME"
end
function Users:format_to_db(params)
- if not params.role then
- params.role = self.role.INVALID
- end
+ if not params.role then
+ params.role = self.role.INVALID
+ end
end
function Users.format_from_db(_, params)
- params.password = nil
- params.api_key = nil
+ params.password = nil
+ params.api_key = nil
end
function Users:is_unique(username)
- local user = self:get(username)
- return not user and true or nil, "FIXME", user
+ local user = self:get(username)
+ return not user and true or nil, "FIXME", user
end
function Users.validate_password(_, password, confirm, old_password)
- if password ~= confirm or password ~= old_password then
- return nil, "FIXME"
- end
+ if password ~= confirm or password ~= old_password then
+ return nil, "FIXME"
+ end
- return true
+ return true
end
function Users:generate_api_key()
- for _ = 1, 10 do
- local api_key = uuid()
- local user = self:find { api_key=api_key }
- if not user then return api_key end
- end
-
- return nil, "FIXME"
+ for _ = 1, 10 do
+ local api_key = uuid()
+ local user = self:find{
+ api_key = api_key,
+ }
+ if not user then
+ return api_key
+ end
+ end
+
+ return nil, "FIXME"
end
return Users
diff --git a/misc/website/backend/app/src/sass/posts.scss b/misc/website/backend/app/src/sass/posts.scss
deleted file mode 100755
index a42c6d3..0000000
--- a/misc/website/backend/app/src/sass/posts.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-$spacing: 10px;
-
-.thread_container, .post_container {
- margin: $spacing 0 0 0;
- padding: $spacing;
-}
-
-.thread_container {
- overflow: visible;
-
- .op, .post_container {
- position: relative;
- }
-
- .op {
- .post_admin {
- margin-left: $spacing * 35;
- }
- }
-
- .post_container {
- display: table;
- min-width: 300px;
- max-width: 100%;
-
- .post_admin {
- margin-left: $spacing * 2;
- }
- }
-
- .post_file {
- margin: 0 0 3px 0;
-
- a {
- text-decoration: underline;
- }
- }
-
- .post_image {
- float: left;
- margin: 0 $spacing * 2 0 $spacing;
-
- img {
- max-width: 1000px;
- max-height: 1000px;
- }
- }
-
- .post_subject, .post_name {
- font-weight: bold;
- }
-
- .post_comment {
- padding: $spacing $spacing * 1.5;
-
- a {
- text-decoration: underline;
- }
-
- .broken_link {
- text-decoration: line-through;
- }
-
- .spoiler {
- background-color: #000000;
- color: #000000;
-
- &:hover {
- color: #ffffff;
- }
- }
-
- .post_banned {
- color: #ff0000;
- font-weight: bold;
- margin-top: $spacing * 2;
- }
- }
-
- .post_flag, .post_menu {
- cursor: pointer;
- }
-
- .post_menu {
- position: relative;
- display: inline-block;
-
- .menu {
- display: none;
- position: absolute;
- z-index: 9;
-
- div {
- padding: 3px;
-
- form {
- margin: 0;
- padding: 0;
-
- input[type="submit"], button {
- background: none;
- border: none;
- padding: 0;
- }
- }
- }
- }
- }
-}
diff --git a/misc/website/backend/app/src/sass/reset.scss b/misc/website/backend/app/src/sass/reset.scss
deleted file mode 100755
index 887bf88..0000000
--- a/misc/website/backend/app/src/sass/reset.scss
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- HTML5 Reset :: style.css
- ----------------------------------------------------------
- We have learned much from/been inspired by/taken code where offered from:
-
- Eric Meyer :: http://meyerweb.com
- HTML5 Doctor :: http://html5doctor.com
- and the HTML5 Boilerplate :: http://html5boilerplate.com
-
--------------------------------------------------------------------------------*/
-
-/* Let's default this puppy out
--------------------------------------------------------------------------------*/
-
-html, body, body div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, menu, nav, section, time, mark, audio, video, details, summary {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font-weight: normal;
- vertical-align: baseline;
- background: transparent;
-}
-
-article, aside, figure, footer, header, nav, section, details, summary {display: block;}
-
-/* Handle box-sizing while better addressing child elements:
- http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */
-html {
- box-sizing: border-box;
-}
-
-*,
-*:before,
-*:after {
- box-sizing: inherit;
-}
-
-/* consider resetting the default cursor: https://gist.github.com/murtaugh/5247154 */
-
-/* Responsive images and other embedded objects */
-/* if you don't have full control over `img` tags (if you have to overcome attributes), consider adding height: auto */
-img,
-object,
-embed {max-width: 100%;}
-
-/*
- Note: keeping IMG here will cause problems if you're using foreground images as sprites.
- In fact, it *will* cause problems with Google Maps' controls at small size.
- If this is the case for you, try uncommenting the following:
-
-#map img {
- max-width: none;
-}
-*/
-
-/* force a vertical scrollbar to prevent a jumpy page */
-html {overflow-y: scroll;}
-
-/* we use a lot of ULs that aren't bulleted.
- you'll have to restore the bullets within content,
- which is fine because they're probably customized anyway */
-ul {list-style: none;}
-
-blockquote, q {quotes: none;}
-
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {content: ''; content: none;}
-
-a {margin: 0; padding: 0; font-size: 100%; vertical-align: baseline; background: transparent;}
-
-del {text-decoration: line-through;}
-
-abbr[title], dfn[title] {border-bottom: 1px dotted #000; cursor: help;}
-
-/* tables still need cellspacing="0" in the markup */
-table {border-collapse: collapse; border-spacing: 0;}
-th {font-weight: bold; vertical-align: bottom;}
-td {font-weight: normal; vertical-align: top;}
-
-hr {display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0;}
-
-input, select {vertical-align: middle;}
-
-pre {
- white-space: pre; /* CSS2 */
- white-space: pre-wrap; /* CSS 2.1 */
- white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
- word-wrap: break-word; /* IE */
-}
-
-input[type="radio"] {vertical-align: text-bottom;}
-.ie7 input[type="checkbox"] {vertical-align: baseline;}
-.ie6 input {vertical-align: text-bottom;}
-
-select, input, textarea {font: 99% sans-serif;}
-
-table {font-size: inherit; font: 100%;}
-
-small {font-size: 85%;}
-
-strong {font-weight: bold;}
-
-td, td img {vertical-align: top;}
-
-/* Make sure sup and sub don't mess with your line-heights http://gist.github.com/413930 */
-sub, sup {font-size: 75%; line-height: 0; position: relative;}
-sup {top: -0.5em;}
-sub {bottom: -0.25em;}
-
-/* standardize any monospaced elements */
-pre, code, kbd, samp {font-family: monospace, sans-serif;}
-
-/* hand cursor on clickable elements */
-.clickable,
-input[type=button],
-input[type=submit],
-input[type=file],
-button {cursor: pointer;}
-
-/* Webkit browsers add a 2px margin outside the chrome of form elements */
-button, input, select, textarea {margin: 0;}
-
-/* make buttons play nice in IE */
-button,
-input[type=button] {width: auto; overflow: visible;}
-
-/* scale images in IE7 more attractively */
-.ie7 img {-ms-interpolation-mode: bicubic;}
-
-/* prevent BG image flicker upon hover
- (commented out as usage is rare, and the filter syntax messes with some pre-processors)
-.ie6 html {filter: expression(document.execCommand("BackgroundImageCache", false, true));}
-*/
-
-/* let's clear some floats */
-.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }
-.clearfix:after { clear: both; }
-.clearfix { zoom: 1; }
diff --git a/misc/website/backend/app/src/sass/style.scss b/misc/website/backend/app/src/sass/style.scss
deleted file mode 100755
index 83fae1f..0000000
--- a/misc/website/backend/app/src/sass/style.scss
+++ /dev/null
@@ -1,322 +0,0 @@
-@import "reset";
-@import "posts";
-
-@mixin display-flex {
- display: -webkit-box-flex;
- display: -webkit-flexbox;
- display: -ms-flexbox;
- display: -webkit-box;
- display: flex;
-}
-
-@mixin flex($args) {
- -webkit-flex: $args;
- -ms-flex: $args;
- flex: $args;
-}
-
-@mixin flex-direction($dir) {
- $alt: vertical !default;
- @if $dir == column {
- $alt: vertical;
- } @else {
- $alt: horizontal;
- }
- -webkit-flex-direction: column;
- -webkit-box-orient: $alt;
- -ms-flex-direction: column;
- flex-direction: column;
-}
-
-$spacing: 10px;
-
-body {
- margin: $spacing;
- font-size: 10pt;
- font-family: Helvetica, "Noto Sans", "Roboto Sans", Arial, sans-serif;
-}
-
-a {
- text-decoration: none;
-}
-
-input[type="text"],
-input[type="password"],
-textarea,
-select,
-.admin_main {
- padding: 4px;
- width: 280px;
-}
-
-input[type="checkbox"] {
- margin: 4px 0;
-}
-
-input[type="file"] {
- padding: 4px 0;
-}
-
-h1 {
- font-size: 240%;
- font-weight: bolder;
- margin-top: 10px;
- text-align: center;
-}
-
-h2 {
- margin: $spacing 0;
- text-align: center;
-}
-
-hr {
- clear: left;
-}
-
-form {
- display: inline-block;
- margin: $spacing / 2 auto;
- padding: $spacing;
-}
-
-table {
- border-collapse: separate;
- border-spacing: 1px;
- margin: 0 auto;
- max-width: 80%;
-
- thead {
- vertical-align: middle;
-
- td {
- font-weight: bolder;
- padding: $spacing / 2 $spacing;
- }
- }
-
- td {
- padding: 3px $spacing / 2;
- text-align: center;
- }
-
- .rules {
- text-align: left;
- }
-}
-
-ul {
- list-style: disc;
-
- li {
- margin-left: $spacing * 2;
- }
-}
-
-ol {
- list-style: decimal;
-
- li {
- margin-left: $spacing * 2;
- }
-}
-
-#error {
- background-color: #ff0000;
- color: #ffffff;
- margin-bottom: $spacing;
- padding: $spacing;
- text-align: center;
-
- h3 {
- font-size: 220%;
- font-weight: bolder;
-
- }
-
- p {
- font-weight: bold;
- }
-}
-
-#post_form, .admin_form {
- text-align: center;
-
- form {
- div {
- @include display-flex;
-
- .title {
- @include flex(0);
- font-weight: bold;
- text-align: right;
- min-width: 120px;
- margin: 1px;
- padding: 4px;
-
- span {
- cursor: pointer;
- }
- }
-
- .fields {
- margin: 1px;
-
- textarea {
- min-height: 100px !important;
- }
- }
- }
-
- button {
- margin: $spacing 0 0 0;
- }
- }
-}
-
-.admin_form {
- form {
- margin: 0;
- padding: 0;
-
- button {
- margin: 0;
- }
- }
-}
-
-.required {
- color: #ff0000;
-}
-
-.boards, .return, .copyright {
- text-align: center;
-}
-
-.archive_stats {
- text-align: center;
- margin-bottom: $spacing;
-}
-
-.announcement {
- text-align: center;
- font-weight: bold;
-}
-
-.banned {
- border: 7px dashed #000000;
- display: table;
- font-size: 180%;
- min-width: 200px;
- max-width: 600px;
- margin: $spacing * 2 auto;
- padding: $spacing;
-
- p {
- margin: $spacing;
- }
-
- div {
- text-align: center;
- }
-}
-
-.medium {
- width: 120px !important;
-}
-
-.short {
- width: 40px !important;
-}
-
-.catalog_container {
- display: inline-block;
- overflow: hidden;
- text-align: center;
- vertical-align: top;
- width: 135px;
-
- .catalog_stats {
- font-size: 70%;
- }
-
- img {
- box-shadow: 0 0 5px rgba(0, 0, 0, 0.25);
- max-width: 125px;
- max-height: 125px;
- }
-}
-
-.logout {
- top: $spacing;
- right: $spacing;
- position: absolute;
-}
-
-.copyright {
- margin-top: $spacing;
-}
-
-.front_page {
- h2 {
- font-size: 180%;
- }
-
- h3 {
- font-size: 140%;
- margin-top: $spacing;
- }
-
- .board {
- display: inline-block;
- max-width: 300px;
- margin: $spacing * 2;
- vertical-align: top;
-
- a {
- font-size: 160%;
- font-weight: bold;
- }
-
- .subtext {
- display: block;
- font-size: 120%;
- }
- }
-}
-
-.table_of_contents {
- display: table;
- margin: 0 auto;
- max-width: 400px;
-}
-
-.answers,{
- max-width: 600px;
- margin: 0 auto;
-
- h2 {
- font-size: 160%;
- }
-}
-
-.install {
- max-width: 300px;
- margin: 0 auto;
-
- h2 {
- font-size: 160%;
- margin-top: $spacing * 2;
- }
-
- label {
- font-weight: bold;
- margin-top: $spacing * 2;
- }
-
- button {
- font-size: 120%;
- font-weight: bold;
- margin-top: $spacing * 2;
- padding: $spacing / 2;
- }
-}
diff --git a/misc/website/backend/app/src/sass/yotsuba.scss b/misc/website/backend/app/src/sass/yotsuba.scss
deleted file mode 100755
index 5c6b253..0000000
--- a/misc/website/backend/app/src/sass/yotsuba.scss
+++ /dev/null
@@ -1,113 +0,0 @@
-$background: #ffffee;
-$bg_light: #ffffff;
-$border: #d9bfb7;
-$subject: #cc1105;
-$header: #800000;
-$link: #0000ee;
-$hover: #ff0000;
-$quote: #000080;
-$post: #f0e0d6;
-$name: #117743;
-$black: #000000;
-$green: #789922;
-$blue: #292299;
-$active: #f0c0b0;
-$active_border: #d99f91;
-
-body {
- background-color: $background;
-}
-
-body, h1, h2 {
- color: $header;
-}
-
-a, a:visited, .broken_link {
- color: $link;
-}
-
-a:hover, .quote_link:hover, .broken_link:hover {
- color: $hover;
-}
-
-.quote_link {
- color: $quote;
-}
-
-.quote_green {
- color: $green;
-}
-
-.quote_blue {
- color: $blue;
-}
-
-.announcement {
- color: $header;
-}
-
-#post_form, .admin_form {
- form {
- .title {
- background-color: $active;
- border: 1px solid $active_border;
- }
- }
-}
-
-table {
- thead {
- td {
- background-color: $post;
- border: 1px solid $border;
- }
- }
-
- tr:nth-of-type(odd) {
- background-color: $background;
- }
-
- tr:nth-of-type(even) {
- background-color: $bg_light;
- }
-}
-
-.post_container {
- background-color: $post;
- border-right: 1px solid $border;
- border-bottom: 1px solid $border;
-
- &:target {
- background-color: $active;
- border-right: 1px solid $active_border;
- border-bottom: 1px solid $active_border;
- }
-}
-
-.post_subject {
- color: $subject;
-}
-
-.post_name, .post_trip {
- color: $name;
-}
-
-.post_menu .menu {
- background-color: $post;
- border:1px solid $border;
-
- div {
- border-right: 1px solid $border;
- border-bottom: 1px solid $border;
-
- form {
- button {
- color: $header;
-
- &:hover {
- color: $hover;
- }
- }
- }
- }
-}
diff --git a/misc/website/backend/app/src/sass/yotsuba_b.scss b/misc/website/backend/app/src/sass/yotsuba_b.scss
deleted file mode 100755
index 732c1db..0000000
--- a/misc/website/backend/app/src/sass/yotsuba_b.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-$background: #eef2ff;
-$bg_light: #f7f9ff;
-$border: #b7c5d9;
-$subject: #0f0c5d;
-$header: #af0a0f;
-$link: #34345c;
-$hover: #dd0000;
-$post: #d6daf0;
-$name: #117743;
-$black: #000000;
-$green: #789922;
-$blue: #292299;
-$active: #d6bad0;
-$active_border: #ba9dbf;
-
-body {
- background-color: $background;
- color: $black;
-}
-
-h1, h2 {
- color: $header;
-}
-
-a, a:visited, .broken_link {
- color: $link;
-}
-
-a:hover, .quote_link, .quote_link:visited, .broken_link:hover {
- color: $hover;
-}
-
-.quote_green {
- color: $green;
-}
-
-.quote_blue {
- color: $blue;
-}
-
-.announcement {
- color: $header;
-}
-
-#post_form, .admin_form {
- form {
- .title {
- background-color: $active;
- border: 1px solid $active_border;
- }
- }
-}
-
-table {
- thead {
- td {
- background-color: $post;
- border: 1px solid $border;
- }
- }
-
- tr:nth-of-type(odd) {
- background-color: $background;
- }
-
- tr:nth-of-type(even) {
- background-color: $bg_light;
- }
-}
-
-.post_container {
- background-color: $post;
- border-right: 1px solid $border;
- border-bottom: 1px solid $border;
-
- &:target {
- background-color: $active;
- border-right: 1px solid $active_border;
- border-bottom: 1px solid $active_border;
- }
-}
-
-.post_subject {
- color: $subject;
-}
-
-.post_name, .post_trip {
- color: $name;
-}
-
-.post_menu .menu {
- background-color: $post;
- border:1px solid $border;
-
- div {
- border-right: 1px solid $border;
- border-bottom: 1px solid $border;
-
- form {
- button {
- color: $link;
-
- &:hover {
- color: $hover;
- }
- }
- }
- }
-}
diff --git a/misc/website/backend/app/src/utils/capture.lua b/misc/website/backend/app/src/utils/capture.lua
index 2b5816b..fe2795f 100755
--- a/misc/website/backend/app/src/utils/capture.lua
+++ b/misc/website/backend/app/src/utils/capture.lua
@@ -1,35 +1,37 @@
-local ngx = _G.ngx
-local json = require "cjson"
+local ngx = _G.ngx
+local json = require"utils.json"
local function capture(method, uri, body)
- local response = ngx.location.capture(uri, {
- method = method,
- body = json.encode(body)
- })
+ local response = ngx.location.capture(uri, {
+ method = method,
+ body = json.encode(body),
+ })
- if response.truncated then return end
+ if response.truncated then
+ return
+ end
- if response.status ~= ngx.HTTP_OK then
- return nil, json.decode(response.body)
- end
+ if response.status ~= ngx.HTTP_OK then
+ return nil, json.decode(response.body)
+ end
- return json.decode(response.body)
+ return json.decode(response.body)
end
return {
- get = function(...)
- return capture(ngx.HTTP_GET, ...)
- end,
+ get = function(...)
+ return capture(ngx.HTTP_GET, ...)
+ end,
- post = function(...)
- return capture(ngx.HTTP_POST, ...)
- end,
+ post = function(...)
+ return capture(ngx.HTTP_POST, ...)
+ end,
- put = function(...)
- return capture(ngx.HTTP_PUT, ...)
- end,
+ put = function(...)
+ return capture(ngx.HTTP_PUT, ...)
+ end,
- delete = function(...)
- return capture(ngx.HTTP_DELETE, ...)
- end,
+ delete = function(...)
+ return capture(ngx.HTTP_DELETE, ...)
+ end,
}
diff --git a/misc/website/backend/app/src/utils/error.lua b/misc/website/backend/app/src/utils/error.lua
index c6644bc..c157d06 100755
--- a/misc/website/backend/app/src/utils/error.lua
+++ b/misc/website/backend/app/src/utils/error.lua
@@ -1,64 +1,94 @@
-local ngx = _G.ngx
+local ngx = _G.ngx
local get_error = {}
-local status = {}
+local status = {}
---[[ API Error Codes ]]--
+--[[ API Error Codes ]] --
-- Authorization
-- email:api_key format in Authorization HTTP header is invalid
function get_error.malformed_authorization()
- return { code=100 }
+ return {
+ code = 100,
+ }
end
-- email:api_key in Authorization HTTP header does not match any user
-- login credentials do not match any user
function get_error.invalid_authorization()
- return { code=101 }
+ return {
+ code = 101,
+ }
end
-- Attempting to access endpoint that requires higher priviliges
function get_error.unauthorized_access()
- return { code=102 }
+ return {
+ code = 102,
+ }
end
-- Data Validation
function get_error.field_not_found(field)
- return { code=200, field=field }
+ return {
+ code = 200,
+ field = field,
+ }
end
function get_error.field_invalid(field)
- return { code=201, field=field }
+ return {
+ code = 201,
+ field = field,
+ }
end
function get_error.field_not_unique(field)
- return { code=202, field=field }
+ return {
+ code = 202,
+ field = field,
+ }
end
function get_error.token_expired(field)
- return { code=203, field=field }
+ return {
+ code = 203,
+ field = field,
+ }
end
function get_error.password_not_match()
- return { code=204 }
+ return {
+ code = 204,
+ }
end
-- Database I/O
function get_error.database_unresponsive()
- return { code=300 }
+ return {
+ code = 300,
+ }
end
function get_error.database_create()
- return { code=301 }
+ return {
+ code = 301,
+ }
end
function get_error.database_modify()
- return { code=302 }
+ return {
+ code = 302,
+ }
end
function get_error.database_delete()
- return { code=303 }
+ return {
+ code = 303,
+ }
end
function get_error.database_select()
- return { code=304 }
+ return {
+ code = 304,
+ }
end
---[[ API -> HTTP Code Map ]]--
+--[[ API -> HTTP Code Map ]] --
-- Authorization
status[100] = ngx.HTTP_BAD_REQUEST
@@ -79,26 +109,26 @@ status[303] = ngx.HTTP_INTERNAL_SERVER_ERROR
status[304] = ngx.HTTP_INTERNAL_SERVER_ERROR
return {
- get_error = get_error,
- handle = function(self)
-
- -- Inject localized error messages
- for _, err in ipairs(self.errors) do
- --err.message = self.i18n(err.code)
- if type(err) == "table" then
- for k, v in pairs(err) do
- print(k, ": ", v)
- end
- else
- print(err)
- end
- end
-
- print(#self.errors)
-
- return self:write {
- status = 401,--status[self.errors[1].code],
- json = self.errors
- }
- end
+ get_error = get_error,
+ handle = function(self)
+
+ -- Inject localized error messages
+ for _, err in ipairs(self.errors) do
+ -- err.message = self.i18n(err.code)
+ if type(err) == "table" then
+ for k, v in pairs(err) do
+ print(k, ": ", v)
+ end
+ else
+ print(err)
+ end
+ end
+
+ print(#self.errors)
+
+ return self:write{
+ status = 401, -- status[self.errors[1].code],
+ json = self.errors,
+ }
+ end,
}
diff --git a/misc/website/backend/app/src/utils/file_whitelist.lua b/misc/website/backend/app/src/utils/file_whitelist.lua
index 78aa552..aefd14d 100755
--- a/misc/website/backend/app/src/utils/file_whitelist.lua
+++ b/misc/website/backend/app/src/utils/file_whitelist.lua
@@ -1,22 +1,22 @@
-- A whitelist of filetypes
return {
- -- Image formats
- image = {
- [".bmp"] = true,
- [".png"] = true,
- [".gif"] = true,
- [".jpg"] = true,
- [".jpeg"] = true,
- [".webp"] = true,
- [".webm"] = true,
- [".svg"] = true
- },
+ -- Image formats
+ image = {
+ [".bmp"] = true,
+ [".png"] = true,
+ [".gif"] = true,
+ [".jpg"] = true,
+ [".jpeg"] = true,
+ [".webp"] = true,
+ [".webm"] = true,
+ [".svg"] = true,
+ },
- -- Audio formats
- audio = {
- [".wav"] = true,
- [".flac"] = true,
- [".mp3"] = true,
- [".ogg"] = true
- }
+ -- Audio formats
+ audio = {
+ [".wav"] = true,
+ [".flac"] = true,
+ [".mp3"] = true,
+ [".ogg"] = true,
+ },
}
diff --git a/misc/website/backend/app/src/utils/generate.lua b/misc/website/backend/app/src/utils/generate.lua
index 2dd32a4..d95d2f9 100755
--- a/misc/website/backend/app/src/utils/generate.lua
+++ b/misc/website/backend/app/src/utils/generate.lua
@@ -1,29 +1,28 @@
-
-local config = require("lapis.config").get()
+local config = require("lapis.config").get()
local encoding = require "lapis.util.encoding"
-local sha256 = require "resty.sha256"
-local ffi = require "ffi"
-local posix = require "posix"
-local salt = loadfile("../data/secrets/salt.lua")()
-local token = config.secret
-local sf = string.format
-local ss = string.sub
+local sha256 = require "resty.sha256"
+local ffi = require "ffi"
+local posix = require "posix"
+local salt = loadfile("../data/secrets/salt.lua")()
+local token = config.secret
+local sf = string.format
+local ss = string.sub
local function get_chunks(str)
- -- Secure trip
- local name, tripcode = str:match("(.-)(##.+)")
+ -- Secure trip
+ local name, tripcode = str:match("(.-)(##.+)")
- -- Insecure trip
- if not name then
- name, tripcode = str:match("(.-)(#.+)")
+ -- Insecure trip
+ if not name then
+ name, tripcode = str:match("(.-)(#.+)")
- -- Just a name
- if not name then
- return str:match("(.+)")
- end
- end
+ -- Just a name
+ if not name then
+ return str:match("(.+)")
+ end
+ end
- return name, tripcode
+ return name, tripcode
end
local generate = {}
@@ -31,23 +30,23 @@ local generate = {}
-- math.random isn't reliable for this use case, so instead we're gonna snag
-- some bytes from /dev/urandom, create a uint32, and grab the last 3 digits.
function generate.random()
- -- Read uint32_t from /dev/urandom
- local r = io.open("/dev/urandom", "rb")
- local bytes = r:read(4)
- r:close()
+ -- Read uint32_t from /dev/urandom
+ local r = io.open("/dev/urandom", "rb")
+ local bytes = r:read(4)
+ r:close()
- -- Build number
- local num = ffi.new("unsigned int[1]")
- ffi.copy(num, bytes, 4)
+ -- Build number
+ local num = ffi.new("unsigned int[1]")
+ ffi.copy(num, bytes, 4)
- return sf("%03d", num[0] % 1000)
+ return sf("%03d", num[0] % 1000)
end
-- Generate an insecure password
function generate.password(time)
- local hasher = sha256:new()
- hasher:update(sf("%s%s", time, generate.random()))
- return encoding.encode_base64(hasher:final())
+ local hasher = sha256:new()
+ hasher:update(sf("%s%s", time, generate.random()))
+ return encoding.encode_base64(hasher:final())
end
-- Generate a secure or insecure tripcode based off the name a user supplies
@@ -55,40 +54,40 @@ end
-- Secure tripcodes use sha256 + the app's secret token.
-- Insecure tripcodes use standard posix crypt + the app's secret salt.
function generate.tripcode(raw_name)
- local name, tripcode = get_chunks(raw_name)
-
- if tripcode then
- local pattern = "^([^=]*)"
- tripcode = tripcode:sub(2) -- remove leading '#'
-
- -- Secure tripcode
- if tripcode:sub(1, 1) == "#" then
- local hasher = sha256:new()
- tripcode = token .. tripcode:sub(2) -- remove leading '#'
- hasher:update(tripcode)
- local hash = encoding.encode_base64(hasher:final())
- tripcode = "!!" .. ss(hash:match(pattern), -10)
- -- Insecure tripcode
- else
- local hash = posix.crypt(tripcode, salt)
- tripcode = "!" .. ss(hash, -10)
- end
- end
-
- return name, tripcode
+ local name, tripcode = get_chunks(raw_name)
+
+ if tripcode then
+ local pattern = "^([^=]*)"
+ tripcode = tripcode:sub(2) -- remove leading '#'
+
+ -- Secure tripcode
+ if tripcode:sub(1, 1) == "#" then
+ local hasher = sha256:new()
+ tripcode = token .. tripcode:sub(2) -- remove leading '#'
+ hasher:update(tripcode)
+ local hash = encoding.encode_base64(hasher:final())
+ tripcode = "!!" .. ss(hash:match(pattern), -10)
+ -- Insecure tripcode
+ else
+ local hash = posix.crypt(tripcode, salt)
+ tripcode = "!" .. ss(hash, -10)
+ end
+ end
+
+ return name, tripcode
end
function generate.errors(i18n, errors)
- local err = {}
+ local err = {}
- if #errors > 0 then
- for _, error in ipairs(errors) do
- local e = i18n(unpack(error))
- table.insert(err, e)
- end
- end
+ if #errors > 0 then
+ for _, error in ipairs(errors) do
+ local e = i18n(unpack(error))
+ table.insert(err, e)
+ end
+ end
- return err
+ return err
end
return generate
diff --git a/misc/website/backend/app/src/utils/json.lua b/misc/website/backend/app/src/utils/json.lua
new file mode 100644
index 0000000..27f4a21
--- /dev/null
+++ b/misc/website/backend/app/src/utils/json.lua
@@ -0,0 +1,42 @@
+local cjson = require("cjson")
+local xpcall = xpcall
+
+-- 设置 处理稀疏数组
+-- https://www.kyne.com.au/~mark/software/lua-cjson-manual.html#encode_sparse_array
+cjson.encode_sparse_array(true, 1, 1)
+
+-- https://github.com/cloudwu/lua-cjson/pull/8
+cjson.encode_empty_table_as_array("on")
+
+-- https://github.com/cloudwu/lua-cjson/pull/10
+cjson.encode_number_precision(16)
+
+local json = {}
+
+function json.encode(var)
+ local function _logExce(err)
+ print("json encode", err)
+ end
+
+ local status, result = xpcall(cjson.encode, _logExce, var)
+ if status then
+ return result
+ end
+end
+
+function json.decode(text)
+ if not text then
+ return
+ end
+
+ local function _logExce(err)
+ print("json decode", text, err)
+ end
+
+ local status, result = xpcall(cjson.decode, _logExce, text)
+ if status then
+ return result
+ end
+end
+
+return json
diff --git a/misc/website/backend/app/src/utils/request_processor.lua b/misc/website/backend/app/src/utils/request_processor.lua
deleted file mode 100755
index 3e4cec7..0000000
--- a/misc/website/backend/app/src/utils/request_processor.lua
+++ /dev/null
@@ -1,298 +0,0 @@
-local Bans = require "models.bans"
-local Threads = require "models.threads"
-local Posts = require "models.posts"
-local Reports = require "models.reports"
-local process = {}
-
-function process.create_thread(params, session, board)
-
- -- Prepare data for entry
- local _, err = Posts:prepare_post(params, session, board)
- if err then
- return false, err
- end
-
- -- Archive old threads
- local max_threads = board.threads_per_page * board.pages
- Threads:archive_threads(board.id, max_threads)
-
- -- Delete old archived threads
- local time = os.time()
- local threads = Threads:get_archived_threads(board.id)
-
- for _, t in ipairs(threads) do
- if time - t.last_active > board.archive_time and not t.save then
- local posts = Posts:get_thread_posts(t.id)
- Threads:delete_thread("override", t, posts[1])
-
- -- Delete all associated posts
- for _, post in ipairs(posts) do
- Posts:delete_post("override", board, post)
-
- -- Delete associated report
- local report = Reports:get_report(post.id)
- if report then
- Reports:delete_report(report)
- end
- end
- end
- end
-
- -- Insert post data into database
- local post, err = Posts:create_post(
- params,
- session,
- board,
- thread,
- true
- )
- if err then
- return false, err
- end
-
- return post
-end
-
-function process.create_post(params, session, board, thread)
- local posts = Posts:count_posts(thread.id)
- local files = Posts:count_files(thread.id)
-
- -- Prepare data for entry
- local _, err = Posts:prepare_post(
- params, session, board, thread, files
- )
- if err then
- return false, err
- end
-
- -- Insert post data into database
- local post, err = Posts:create_post(
- params,
- session,
- board,
- thread,
- false
- )
- if err then
- return false, err
- end
-
- posts = posts + 1
-
- -- Check for [auto]sage
- if params.options ~= "sage" and
- posts <= board.post_limit then
- -- Update thread
- thread.last_active = os.time()
- thread:update("last_active")
- end
-
- return post
-end
-
-function process.delete_thread(params, session, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.thread_id)
- if not post then
- return false, { "err_invalid_post", { params.thread_id } }
- end
-
- -- Validate thread
- local thread = Threads:get_thread(post.thread_id)
- if not thread then
- return false, { "err_invalid_thread" }
- end
-
- local posts = Posts:get_posts_by_thread(thread.id)
-
- -- Delete thread
- local _, err = Threads:delete_thread(session, thread, posts[1])
- if err then
- return false, err
- end
-
- -- Delete all associated posts
- for _, post in ipairs(posts) do
- Posts:delete_post("override", board, post)
-
- -- Delete associated report
- local report = Reports:get_report(board.id, post.id)
- if report then
- Reports:delete_report(report)
- end
- end
-
- return true
-end
-
-function process.delete_post(params, session, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.post_id } }
- end
-
- -- Validate thread
- local thread = Threads:get_thread(post.thread_id)
- if not thread then
- return false, { "err_invalid_thread" }
- end
-
- -- Delete post
- local _, err = Posts:delete_post(session, board, post)
- if err then
- return false, err
- end
-
- -- Update thread
- local posts = Posts:get_posts_by_thread(thread.id)
- thread.last_active = posts[#posts].timestamp
- thread:update("last_active")
-
- return true
-end
-
-function process.report_post(params, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.thread } }
- end
-
- local report = Reports:get_report(board.id, post.post_id)
-
- -- If report exists, update it
- if report then
- report.num_reports = report.num_reports + 1 -- FIXME: race condition
- local _, err = Reports:modify_report(report)
- if err then
- return false, err
- end
- -- If report is new, create it
- else
- local _, err = Reports:create_report {
- board_id = board.id,
- thread_id = post.thread_id,
- post_id = post.post_id,
- timestamp = os.time(),
- num_reports = 1
- }
- if err then
- return false, err
- end
- end
-
- return post
-end
-
--- Sticky thread
-function process.sticky_thread(params, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.post_id } }
- end
-
- -- Validate thread
- local thread = Threads:get_thread(post.thread_id)
- if not thread then
- return false, { "err_invalid_thread" }
- end
-
- thread.sticky = not thread.sticky
- thread:update("sticky")
-
- return true
-end
-
--- Lock thread
-function process.lock_thread(params, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.post_id } }
- end
-
- -- Validate thread
- local thread = Threads:get_thread(post.thread_id)
- if not thread then
- return false, { "err_invalid_thread" }
- end
-
- thread.lock = not thread.lock
- thread:update("lock")
-
- return true
-end
-
--- Save thread
-function process.save_thread(params, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.post_id } }
- end
-
- -- Validate thread
- local thread = Threads:get_thread(post.thread_id)
- if not thread then
- return false, { "err_invalid_thread" }
- end
-
- thread.save = not thread.save
- thread:update("save")
-
- return true
-end
-
--- Override thread
-function process.override_thread(params, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.post_id } }
- end
-
- -- Validate thread
- local thread = Threads:get_thread(post.thread_id)
- if not thread then
- return false, { "err_invalid_thread" }
- end
-
- thread.size_override = not thread.size_override
- thread:update("size_override")
-
- return true
-end
-
--- Ban user
-function process.ban_user(params, board)
- -- Validate post
- local post = Posts:get_post(board.id, params.post_id)
- if not post then
- return false, { "err_invalid_post", { params.post_id } }
- end
-
- params.ip = post.ip
-
- -- Convert board name to id if checkbox is set
- if params.board_id then
- params.board_id = board.id
- end
-
- -- Ban user
- local _, err = Bans:create_ban(params)
- if err then
- return false, err
- end
-
- -- Flag post
- if params.banned then
- post.banned = true
- post:update("banned")
- end
-
- return true
-end
-
-return process
diff --git a/misc/website/backend/app/src/utils/role.lua b/misc/website/backend/app/src/utils/role.lua
index 87062ce..f4c22a0 100755
--- a/misc/website/backend/app/src/utils/role.lua
+++ b/misc/website/backend/app/src/utils/role.lua
@@ -1,31 +1,31 @@
-local models = require "models"
-local get_error = require "utils.error".get_error
-local Users = models.users
-local role = {}
+local models = require "models"
+local get_error = require"utils.error".get_error
+local Users = models.users
+local role = {}
-- User must be the Owner
function role.owner(user)
- return user.role == Users.role.OWNER and true or nil, get_error.unauthorized_access()
+ return user.role == Users.role.OWNER and true or nil, get_error.unauthorized_access()
end
-- User must be an Admin or higher
function role.admin(user)
- return user.role >= Users.role.ADMIN and true or nil, get_error.unauthorized_access()
+ return user.role >= Users.role.ADMIN and true or nil, get_error.unauthorized_access()
end
-- User must be a Mod or higher
function role.mod(user)
- return user.role >= Users.role.MOD and true or nil, get_error.unauthorized_access()
+ return user.role >= Users.role.MOD and true or nil, get_error.unauthorized_access()
end
-- User must be a Janitor or higher
function role.janitor(user)
- return user.role >= Users.role.JANITOR and true or nil, get_error.unauthorized_access()
+ return user.role >= Users.role.JANITOR and true or nil, get_error.unauthorized_access()
end
-- User must be signed in
function role.user(user)
- return user.role >= Users.role.USER and true or nil, get_error.unauthorized_access()
+ return user.role >= Users.role.USER and true or nil, get_error.unauthorized_access()
end
return role
diff --git a/misc/website/backend/app/src/utils/text_formatter.lua b/misc/website/backend/app/src/utils/text_formatter.lua
index ae1f44a..f88e1ef 100755
--- a/misc/website/backend/app/src/utils/text_formatter.lua
+++ b/misc/website/backend/app/src/utils/text_formatter.lua
@@ -1,20 +1,20 @@
-local Posts = require "models.posts"
-local escape = require("lapis.html").escape
-local sf = string.format
+local Posts = require "models.posts"
+local escape = require("lapis.html").escape
+local sf = string.format
local formatter = {}
--- Sanitize text for HTML safety
-- @tparam string text Raw text
-- @treturn string formatted
function formatter.sanitize(text)
- return escape(text)
+ return escape(text)
end
--- Format new lines to 'br' tags
-- @tparam string text Raw text
-- @treturn string formatted
function formatter.new_lines(text)
- return text:gsub("\n", "
\n")
+ return text:gsub("\n", "
\n")
end
--- Format words that begin with '>>'
@@ -24,137 +24,150 @@ end
-- @tparam table post Post data
-- @treturn string formatted
function formatter.quote(text, request, board, post)
- local function get_url(board, post_id)
- if tonumber(post_id) then
- local p = Posts:get(board.id, post_id)
- if not p then return false end
-
- local thread = p:get_thread()
- if not thread then return false end
-
- local op = thread:get_op()
- return
- request:url_for("web.boards.thread", { board=board.name, thread=op.post_id }),
- op
- else
- return request:url_for("web.boards.board", { board=board.name })
- end
- end
-
- -- >>1234 ur a fag
- -- >>(%d+)
- local match_pattern = ">>(%d+)"
- local sub_pattern = ">>%s"
-
- -- Get all the matches and store them in an ordered list
- local posts = {}
- for post_id in text:gmatch(match_pattern) do
- table.insert(posts, { board=board, id=post_id })
- end
-
- -- Format each match
- for i, p in ipairs(posts) do
- local text = sf(sub_pattern, p.id)
- local url, op = get_url(p.board, p.id)
- if url then
- if op.thread_id == post.thread_id then
- posts[i] = sf("%s", url, p.id, text)
- else
- posts[i] = sf("%s→", url, p.id, text)
- end
- else
- posts[i] = sf("%s", text)
- end
- end
-
- -- Substitute each match with the formatted match
- local i = 0
- text = text:gsub(match_pattern, function()
- i = i + 1
- return posts[i]
- end)
-
- -- >>>/a/1234 check over here
- -- >>>/(%w+)/(%d*)
- match_pattern = ">>>/(%w+)/(%d*)"
- sub_pattern = ">>>/%s/%s"
-
- -- Get all the matches and store them in an ordered list
- posts = {}
- for b, post_id in text:gmatch(match_pattern) do
- local response = request.api.boards.GET(request)
- b = response.json or b
- table.insert(posts, { board=b, id=post_id })
- end
-
- -- Format each match
- for i, p in ipairs(posts) do
- if type(p.board) == "table" then
- local text = sf(sub_pattern, p.board.name, p.id)
- local url, op = get_url(p.board, p.id)
- if op then
- posts[i] = sf("%s", url, p.id, text)
- else
- posts[i] = sf("%s", url, text)
- end
- else
- local text = sf(sub_pattern, p.board, p.id)
- posts[i] = sf("%s", text)
- end
- end
-
- -- Substitute each match with the formatted match
- i = 0
- text = text:gsub(match_pattern, function()
- i = i + 1
- return posts[i]
- end)
-
- return text
+ local function get_url(board, post_id)
+ if tonumber(post_id) then
+ local p = Posts:get(board.id, post_id)
+ if not p then
+ return false
+ end
+
+ local thread = p:get_thread()
+ if not thread then
+ return false
+ end
+
+ local op = thread:get_op()
+ return request:url_for("web.boards.thread", {
+ board = board.name,
+ thread = op.post_id,
+ }), op
+ else
+ return request:url_for("web.boards.board", {
+ board = board.name,
+ })
+ end
+ end
+
+ -- >>1234 ur a fag
+ -- >>(%d+)
+ local match_pattern = ">>(%d+)"
+ local sub_pattern = ">>%s"
+
+ -- Get all the matches and store them in an ordered list
+ local posts = {}
+ for post_id in text:gmatch(match_pattern) do
+ table.insert(posts, {
+ board = board,
+ id = post_id,
+ })
+ end
+
+ -- Format each match
+ for i, p in ipairs(posts) do
+ local text = sf(sub_pattern, p.id)
+ local url, op = get_url(p.board, p.id)
+ if url then
+ if op.thread_id == post.thread_id then
+ posts[i] = sf("%s", url, p.id, text)
+ else
+ posts[i] = sf("%s→", url, p.id, text)
+ end
+ else
+ posts[i] = sf("%s", text)
+ end
+ end
+
+ -- Substitute each match with the formatted match
+ local i = 0
+ text = text:gsub(match_pattern, function()
+ i = i + 1
+ return posts[i]
+ end)
+
+ -- >>>/a/1234 check over here
+ -- >>>/(%w+)/(%d*)
+ match_pattern = ">>>/(%w+)/(%d*)"
+ sub_pattern = ">>>/%s/%s"
+
+ -- Get all the matches and store them in an ordered list
+ posts = {}
+ for b, post_id in text:gmatch(match_pattern) do
+ local response = request.api.boards.GET(request)
+ b = response.json or b
+ table.insert(posts, {
+ board = b,
+ id = post_id,
+ })
+ end
+
+ -- Format each match
+ for i, p in ipairs(posts) do
+ if type(p.board) == "table" then
+ local text = sf(sub_pattern, p.board.name, p.id)
+ local url, op = get_url(p.board, p.id)
+ if op then
+ posts[i] = sf("%s", url, p.id, text)
+ else
+ posts[i] = sf("%s", url, text)
+ end
+ else
+ local text = sf(sub_pattern, p.board, p.id)
+ posts[i] = sf("%s", text)
+ end
+ end
+
+ -- Substitute each match with the formatted match
+ i = 0
+ text = text:gsub(match_pattern, function()
+ i = i + 1
+ return posts[i]
+ end)
+
+ return text
end
--- Format lines that begin with '>'
-- @tparam string text Raw text
-- @treturn string formatted
function formatter.green_text(text)
- local formatted = ""
+ local formatted = ""
- for line in text:gmatch("[^\n]+") do
- local first = line:sub(1, 4)
+ for line in text:gmatch("[^\n]+") do
+ local first = line:sub(1, 4)
- -- >implying
- if first == ">" then
- line = sf("%s%s%s", "", line, "")
- end
+ -- >implying
+ if first == ">" then
+ line = sf("%s%s%s", "", line, "")
+ end
- formatted = sf("%s%s%s", formatted, line, "\n")
- end
+ formatted = sf("%s%s%s", formatted, line, "\n")
+ end
- return formatted
+ return formatted
end
--- Format lines that begin with '<'
-- @tparam string text Raw text
-- @treturn string formatted
function formatter.blue_text(text)
- local formatted = ""
+ local formatted = ""
- for line in text:gmatch("[^\n]+") do
- local first = line:sub(1, 4)
+ for line in text:gmatch("[^\n]+") do
+ local first = line:sub(1, 4)
- -- ", line, "")
- end
+ -- ", line, "")
+ end
- formatted = sf("%s%s%s", formatted, line, "\n")
- end
+ formatted = sf("%s%s%s", formatted, line, "\n")
+ end
- return formatted
+ return formatted
end
function formatter.spoiler(text)
- return text:gsub("(%[spoiler%])(.-)(%[/spoiler%])", "%2")
+ return text:gsub("(%[spoiler%])(.-)(%[/spoiler%])", "%2")
end
return formatter
diff --git a/misc/website/backend/app/src/views/admin/admin.etlua b/misc/website/backend/app/src/views/admin/admin.etlua
deleted file mode 100755
index 0619f36..0000000
--- a/misc/website/backend/app/src/views/admin/admin.etlua
+++ /dev/null
@@ -1,247 +0,0 @@
-<%= page_title %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/announcement.etlua b/misc/website/backend/app/src/views/admin/announcement.etlua
deleted file mode 100755
index 780c76d..0000000
--- a/misc/website/backend/app/src/views/admin/announcement.etlua
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/board.etlua b/misc/website/backend/app/src/views/admin/board.etlua
deleted file mode 100755
index 9248868..0000000
--- a/misc/website/backend/app/src/views/admin/board.etlua
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/login.etlua b/misc/website/backend/app/src/views/admin/login.etlua
deleted file mode 100755
index 7194224..0000000
--- a/misc/website/backend/app/src/views/admin/login.etlua
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/page.etlua b/misc/website/backend/app/src/views/admin/page.etlua
deleted file mode 100755
index 4ab4e75..0000000
--- a/misc/website/backend/app/src/views/admin/page.etlua
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/success.etlua b/misc/website/backend/app/src/views/admin/success.etlua
deleted file mode 100755
index 2e96583..0000000
--- a/misc/website/backend/app/src/views/admin/success.etlua
+++ /dev/null
@@ -1,3 +0,0 @@
-Success
-<%= action %>
-[<%= i18n("return") %>]
diff --git a/misc/website/backend/app/src/views/admin/user.etlua b/misc/website/backend/app/src/views/admin/user.etlua
deleted file mode 100755
index dd0a932..0000000
--- a/misc/website/backend/app/src/views/admin/user.etlua
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/archive.etlua b/misc/website/backend/app/src/views/archive.etlua
deleted file mode 100755
index a5d7a57..0000000
--- a/misc/website/backend/app/src/views/archive.etlua
+++ /dev/null
@@ -1,49 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% render('views.fragments.announcements') %>
-
-[<%= i18n('return') %>]
-[<%= i18n('catalog') %>]
-[<%= i18n('bottom') %>]
-
-
-
- <%= i18n('arc_display', {
- n_thread = #threads,
- p_thread = i18n('threads', { count=#threads }),
- n_day = days,
- p_day = i18n('days', { count=days })
- }) %>
-
-
-
-
-
- <%= i18n('arc_number') %>
- <%= i18n('arc_name') %>
- <%= i18n('arc_excerpt') %>
- <%= i18n('arc_replies') %>
-
-
-
- <% for _, thread in ipairs(threads) do %>
-
- <%= thread.op.post_id %>
- <%= thread.op.name %> <%= thread.op.trip %>
-
- <% if thread.op.subject then %>
- <%= thread.op.subject %>:
- <% end %>
- <%- thread.op.comment %>
-
- <%= thread.replies %>
- [<%= i18n('arc_view') %>]
-
- <% end %>
-
-
-
-[<%= i18n('return') %>]
-[<%= i18n('catalog') %>]
-[<%= i18n('top') %>]
-
diff --git a/misc/website/backend/app/src/views/banned.etlua b/misc/website/backend/app/src/views/banned.etlua
deleted file mode 100755
index c94fc89..0000000
--- a/misc/website/backend/app/src/views/banned.etlua
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= page_title %>
-
- <%= i18n('ban_reason') %>
- <%= reason %>
- <%- i18n('ban_expire', { expire=''..expire..'' }) %>
- <%- i18n('ban_ip', { ip=''..ip..'' }) %>
- 
-
diff --git a/misc/website/backend/app/src/views/board.etlua b/misc/website/backend/app/src/views/board.etlua
deleted file mode 100755
index 8590492..0000000
--- a/misc/website/backend/app/src/views/board.etlua
+++ /dev/null
@@ -1,36 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% render('views.fragments.form_submit') %>
-<% render('views.fragments.announcements') %>
-
-[<%= i18n('catalog') %>]
-[<%= i18n('archive') %>]
-[<%= i18n('refresh') %>]
-
-<% for _, thread in ipairs(threads) do %>
-
-<%
- local posts = thread.posts or {}
- for i=#posts, 1, -1 do
- local post = posts[i]
- local op = posts[#posts]
- if post.post_id == op.post_id then
- render('views.fragments.op_content', { thread=thread, post=post, posts=posts, is_board=true })
- else
- render('views.fragments.post_content', { thread=thread, post=post, posts=posts, is_board=true, op=op })
- end
- end
-%>
-
-
-<% end %>
-
- <% for i=1, pages do %>
- <% if i == params.page then %>
- [<%= i %>]
- <% else %>
- [<%= i %>]
- <% end %>
- <% end %>
- [<%= i18n('catalog') %>]
- [<%= i18n('archive') %>]
-
diff --git a/misc/website/backend/app/src/views/catalog.etlua b/misc/website/backend/app/src/views/catalog.etlua
deleted file mode 100755
index 108ea8d..0000000
--- a/misc/website/backend/app/src/views/catalog.etlua
+++ /dev/null
@@ -1,34 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% render('views.fragments.form_submit') %>
-<% render('views.fragments.announcements') %>
-
-[<%= i18n('return') %>]
-[<%= i18n('archive') %>]
-[<%= i18n('bottom') %>]
-[<%= i18n('refresh') %>]
-
-<% for t, thread in ipairs(threads) do %>
-
-<% end %>
-
-[<%= i18n('return') %>]
-[<%= i18n('archive') %>]
-[<%= i18n('top') %>]
-[<%= i18n('refresh') %>]
-
diff --git a/misc/website/backend/app/src/views/code_404.etlua b/misc/website/backend/app/src/views/code_404.etlua
deleted file mode 100755
index bd5f8f1..0000000
--- a/misc/website/backend/app/src/views/code_404.etlua
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= page_title %>
-
diff --git a/misc/website/backend/app/src/views/fragments/announcements.etlua b/misc/website/backend/app/src/views/fragments/announcements.etlua
deleted file mode 100755
index 9a4f08c..0000000
--- a/misc/website/backend/app/src/views/fragments/announcements.etlua
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if #announcements > 0 then %>
-
-<% for _, announcement in ipairs(announcements) do %>
-<%= announcement.text %>
-<% end %>
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/board_title.etlua b/misc/website/backend/app/src/views/fragments/board_title.etlua
deleted file mode 100755
index 0c6358b..0000000
--- a/misc/website/backend/app/src/views/fragments/board_title.etlua
+++ /dev/null
@@ -1,6 +0,0 @@
-
- <%= page_title %>
- <% if board.subtext then %>
- <%= board.subtext %>
- <% end %>
-
diff --git a/misc/website/backend/app/src/views/fragments/copyright.etlua b/misc/website/backend/app/src/views/fragments/copyright.etlua
deleted file mode 100755
index 2a06a9d..0000000
--- a/misc/website/backend/app/src/views/fragments/copyright.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
- <%- i18n('copy_software', {
- software = ''..software..'',
- version = 'v'..version
- }) %>
- <%- i18n('copy_download', {
- github = 'GitHub'
- }) %>
-
diff --git a/misc/website/backend/app/src/views/fragments/error.etlua b/misc/website/backend/app/src/views/fragments/error.etlua
deleted file mode 100755
index cb0bdb3..0000000
--- a/misc/website/backend/app/src/views/fragments/error.etlua
+++ /dev/null
@@ -1,6 +0,0 @@
-
-/!\ ALART /!\
-<% for _, err in ipairs(errors) do %>
-<%= err %>
-<% end %>
-
diff --git a/misc/website/backend/app/src/views/fragments/form_ban.etlua b/misc/website/backend/app/src/views/fragments/form_ban.etlua
deleted file mode 100755
index f4d72bf..0000000
--- a/misc/website/backend/app/src/views/fragments/form_ban.etlua
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_delete.etlua b/misc/website/backend/app/src/views/fragments/form_delete.etlua
deleted file mode 100755
index 2a3855c..0000000
--- a/misc/website/backend/app/src/views/fragments/form_delete.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_locale.etlua b/misc/website/backend/app/src/views/fragments/form_locale.etlua
deleted file mode 100755
index 456cbb4..0000000
--- a/misc/website/backend/app/src/views/fragments/form_locale.etlua
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/fragments/form_lock.etlua b/misc/website/backend/app/src/views/fragments/form_lock.etlua
deleted file mode 100755
index 29693d2..0000000
--- a/misc/website/backend/app/src/views/fragments/form_lock.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_override.etlua b/misc/website/backend/app/src/views/fragments/form_override.etlua
deleted file mode 100755
index 1d19005..0000000
--- a/misc/website/backend/app/src/views/fragments/form_override.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_remix.etlua b/misc/website/backend/app/src/views/fragments/form_remix.etlua
deleted file mode 100755
index 6bfae28..0000000
--- a/misc/website/backend/app/src/views/fragments/form_remix.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if thread then %>
-
-<% else %>
-
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/form_report.etlua b/misc/website/backend/app/src/views/fragments/form_report.etlua
deleted file mode 100755
index d1bc1a6..0000000
--- a/misc/website/backend/app/src/views/fragments/form_report.etlua
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_save.etlua b/misc/website/backend/app/src/views/fragments/form_save.etlua
deleted file mode 100755
index 734841f..0000000
--- a/misc/website/backend/app/src/views/fragments/form_save.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_sticky.etlua b/misc/website/backend/app/src/views/fragments/form_sticky.etlua
deleted file mode 100755
index 94e144b..0000000
--- a/misc/website/backend/app/src/views/fragments/form_sticky.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_submit.etlua b/misc/website/backend/app/src/views/fragments/form_submit.etlua
deleted file mode 100755
index 46ce1da..0000000
--- a/misc/website/backend/app/src/views/fragments/form_submit.etlua
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
- *
- <%= i18n("form_required") %>
-
-
- <%-
- i18n("form_readme", { -- FIXME
- rules = 'Rules',
- faq = 'FAQ'
- })
- %>
-
-
diff --git a/misc/website/backend/app/src/views/fragments/list_boards.etlua b/misc/website/backend/app/src/views/fragments/list_boards.etlua
deleted file mode 100755
index d6ac290..0000000
--- a/misc/website/backend/app/src/views/fragments/list_boards.etlua
+++ /dev/null
@@ -1,16 +0,0 @@
-<% if boards then %>
-
- [ <%= i18n('index') %> ]
- <% local group = 1 %>
- <% for i, board in ipairs(boards) do %>
- <% local sub = sub_page or '' %>
- <% if board.group ~= group then %>
- <% group = board.group %> ] [
- <% else %>
- <%= i == 1 and '[' or '/' %>
- <% end %>
- <%= board.name %>
- <%= i == #boards and ']' or '' %>
- <% end %>
-
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/op_content.etlua b/misc/website/backend/app/src/views/fragments/op_content.etlua
deleted file mode 100755
index 512dc90..0000000
--- a/misc/website/backend/app/src/views/fragments/op_content.etlua
+++ /dev/null
@@ -1,71 +0,0 @@
-
- <% if post.file_name then %>
-
- <%= i18n("file") %>:
- <%
- if post.file_name:len() > 35 then
- local short = string.sub(post.file_name, 1, 25)
- local ext = post.file_name:match("^.+(%..+)$")
- local name = string.format("%s(...)%s", short, ext)
- %>
- <%= name %>
- <% else %>
- <%= post.file_name %>
- <% end%>
- (<%= post.file_size %> KB<%= post.file_dimensions %><%= post.file_duration %>)
-
-
- 
-
- <% end %>
-
- <% render("views.fragments.post_menu", { post=post, op=true }) %>
- <% if post.subject then %>
- <%= post.subject %>
- <% end %>
- <%= post.name %>
- <% if post.trip then %>
- <%= post.trip %>
- <% end %>
- <%= post.timestamp %>
- No.<%= post.post_id %>
- <% if thread.sticky or thread.lock or thread.save or thread.size_override then %>
-
- <% if thread.sticky then %>
- 📌
- <% end %>
- <% if thread.lock then %>
- 🔒
- <% end %>
- <% if thread.save then %>
- 💾
- <% end %>
- <% if thread.size_override then %>
- ✔️
- <% end %>
-
- <% end %>
- <% if is_board then %>
- [<%= i18n('reply') %>]
- <% end %>
-
-
-<% if thread.hidden and thread.hidden.posts > 0 then %>
-
- <%-
- i18n("post_hidden", {
- n_post = thread.hidden.posts,
- p_post = i18n("posts", { count=thread.hidden.posts }),
- n_file = thread.hidden.files,
- p_file = i18n("files", { count=thread.hidden.files }),
- click = "Click here"
- })
- %>
-
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/post_content.etlua b/misc/website/backend/app/src/views/fragments/post_content.etlua
deleted file mode 100755
index 385bad2..0000000
--- a/misc/website/backend/app/src/views/fragments/post_content.etlua
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
- <% render("views.fragments.post_menu", { post=post }) %>
- <% if post.subject then %>
- <%= post.subject %>
- <% end %>
- <%= post.name %>
- <% if post.trip then %>
- <%= post.trip %>
- <% end %>
- <%= post.timestamp %>
- No.<%= post.post_id %>
-
- <% if post.file_name then %>
-
- <%= i18n("file") %>:
- <%
- if post.file_name:len() > 35 then
- local short = string.sub(post.file_name, 1, 25)
- local ext = post.file_name:match("^.+(%..+)$")
- local name = string.format("%s(...)%s", short, ext)
- %>
- <%= name %>
- <% else %>
- <%= post.file_name %>
- <% end%>
- (<%= post.file_size %> KB<%= post.file_dimensions %><%= post.file_duration %>)
-
-
-
-
- <% end %>
-
- <%- post.comment %>
- <% if post.banned then %>
- (<%= board.ban_message %>)
- <% end %>
-
-
diff --git a/misc/website/backend/app/src/views/fragments/post_menu.etlua b/misc/website/backend/app/src/views/fragments/post_menu.etlua
deleted file mode 100755
index acdbbee..0000000
--- a/misc/website/backend/app/src/views/fragments/post_menu.etlua
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/return_board.etlua b/misc/website/backend/app/src/views/fragments/return_board.etlua
deleted file mode 100755
index 87b193e..0000000
--- a/misc/website/backend/app/src/views/fragments/return_board.etlua
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [ <%= i18n("return_board") %> ]
-
diff --git a/misc/website/backend/app/src/views/fragments/return_thread.etlua b/misc/website/backend/app/src/views/fragments/return_thread.etlua
deleted file mode 100755
index 77e5193..0000000
--- a/misc/website/backend/app/src/views/fragments/return_thread.etlua
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [ <%= i18n("return_thread") %> ]
-
diff --git a/misc/website/backend/app/src/views/index.etlua b/misc/website/backend/app/src/views/index.etlua
deleted file mode 100755
index a50ad8e..0000000
--- a/misc/website/backend/app/src/views/index.etlua
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= site_name %>
-
- <%= i18n('index_boards') %>
- <% for _, board in ipairs(boards) do %>
-
- /<%= board.name %>/ - <%= board.title %>
- <% if board.subtext then %>
- <%= board.subtext %>
- <% end %>
- <% if board.rules then %>
- <%= i18n('rules') %>
- <%- markdown(board.rules) %>
- <% end %>
-
- <% end %>
-
diff --git a/misc/website/backend/app/src/views/install.etlua b/misc/website/backend/app/src/views/install.etlua
deleted file mode 100755
index a049b6d..0000000
--- a/misc/website/backend/app/src/views/install.etlua
+++ /dev/null
@@ -1,132 +0,0 @@
-Install Lapis-chan
-
-Welcome to Lapis-chan v1.0.0!
-
-
-
-
diff --git a/misc/website/backend/app/src/views/layout.etlua b/misc/website/backend/app/src/views/layout.etlua
deleted file mode 100755
index 3c8f594..0000000
--- a/misc/website/backend/app/src/views/layout.etlua
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
- <% if board then %>
-
- <% if board.draw then %>
-
-
- <% end %>
- <% end %>
-
- <%= page_title %>
-
-
- <% if errors then render('views.fragments.error') end %>
- <% render('views.fragments.list_boards') %>
-
- <% render('views.fragments.form_locale') %>
- <% if session.name then %>
- [<%= i18n('logout') %>]
- <% end %>
-
- <% content_for('inner') %>
- <% render('views.fragments.list_boards') %>
- <% render('views.fragments.copyright') %>
-
-
diff --git a/misc/website/backend/app/src/views/page.etlua b/misc/website/backend/app/src/views/page.etlua
deleted file mode 100755
index f4abf3a..0000000
--- a/misc/website/backend/app/src/views/page.etlua
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= page.name %>
-<%- page.content %>
diff --git a/misc/website/backend/app/src/views/rules.etlua b/misc/website/backend/app/src/views/rules.etlua
deleted file mode 100755
index 4c9ccc3..0000000
--- a/misc/website/backend/app/src/views/rules.etlua
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= i18n("rules") %>
-
-
-
- <%= i18n("board") %>
- <%= i18n("rules") %>
-
-
-
- <% for _, board in ipairs(boards) do %>
-
- <%= board.title %>
- <%- board.rules %>
-
- <% end %>
-
-
diff --git a/misc/website/backend/app/src/views/thread.etlua b/misc/website/backend/app/src/views/thread.etlua
deleted file mode 100755
index 2230e92..0000000
--- a/misc/website/backend/app/src/views/thread.etlua
+++ /dev/null
@@ -1,26 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% if not thread.lock or session.admin or session.mod then
- render('views.fragments.form_submit')
-end %>
-<% render('views.fragments.announcements') %>
-
-[<%= i18n('return') %>]
-[<%= i18n('catalog') %>]
-[<%= i18n('bottom') %>]
-[<%= i18n('refresh') %>]
-
-
-<% for i, post in ipairs(posts) do
- if i == 1 then
- render('views.fragments.op_content', { thread=thread, post=post })
- else
- render('views.fragments.post_content', { thread=thread, post=post, op=posts[1] })
- end
-end %>
-
-
-[<%= i18n('return') %>]
-[<%= i18n('catalog') %>]
-[<%= i18n('top') %>]
-[<%= i18n('refresh') %>]
-
diff --git a/misc/website/backend/app/static/banned.jpg b/misc/website/backend/app/static/banned.jpg
deleted file mode 100755
index 16579efd71e5ae5b2af2db0b5c0adb051436fcc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10148
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 0)
- byteString = atob(dataURI.split(',')[1]);
- else
- byteString = unescape(dataURI.split(',')[1]);
-
- // separate out the mime component
- var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
-
- // write the bytes of the string to a typed array
- var ia = new Uint8Array(byteString.length);
- for (var i = 0; i < byteString.length; i++) {
- ia[i] = byteString.charCodeAt(i);
- }
-
- return new Blob([ia], {type:mimeString});
-}
-
-// Send quote text to submission form
-// @param event A ClickEvent object
-// @return none
-function quote_post(event) {
- var comment = document.getElementById("submit_comment");
- comment.value += ">>" + event.target.text + "\n";
- comment.focus();
-}
-
-// Send quote text to submission from when coming from board index
-// @return none
-function quote_thread() {
- var hash = window.location.hash;
-
- if (hash[1] === "q") {
- quote_post({
- target: {
- text: hash.substring(2)
- }
- });
- }
-}
-
-// Restrict the size of the comment block
-// @return none
-function restrict_comment_size() {
- var comment = document.getElementById("submit_comment");
-
- if (comment.value.length >= text_size) {
- comment.value = comment.value.slice(0, text_size);
- }
-}
-
-// Cancel form submission if input is invalid
-// @return valid
-function validate_input() {
- var file_input = document.getElementById("submit_file");
-
- if (window.FileReader && file_input.files && file_input.files[0]) {
- file = file_input.files[0];
-
- if (file.size / 1024 / 1024 > body_size) {
- alert("File size cannot exceed " + body_size + " MB.");
- return false;
- }
- }
-}
-
-// Toggle post menu visibility
-// @return none
-function toggle_menu() {
- var child = this.parentNode.children[1];
-
- if (child.style.display === "block") {
- child.style.display = "none";
- } else {
- child.style.display = "block";
- }
-}
-
-// Add click events to all reply links
-// @return none
-function add_anchor_listeners() {
- var elements = document.getElementsByClassName("link_reply");
-
- for (var i=0; i < elements.length; i++) {
- elements[i].onclick = quote_post;
- }
-}
-
-// Add change events to various form elements
-// @return none
-function add_change_listeners() {
- var elements = document.getElementsByClassName("change_submit");
-
- for (i=0; i < elements.length; i++) {
- var element = elements[i];
- element.onchange = function(event) {
- event.target.form.submit();
- };
- }
-
- var elements = document.getElementsByClassName("change_delete");
-
- for (i=0; i < elements.length; i++) {
- var element = elements[i];
- element.onchange = function(event) {
- if (window.confirm("Are you sure you want to do this?")) {
- event.target.form.submit();
- }
- };
- }
-}
-
-// Add click events to all menu buttons
-// @return none
-function add_menu_listeners() {
- var buttons = document.getElementsByClassName("post_menu");
-
- for (i=0; i < buttons.length; i++) {
- var button = buttons[i];
- button.children[0].onclick = toggle_menu;
- }
-}
-
-// Add events to various user inputs
-// @return none
-function add_input_constraints() {
- var comment = document.getElementById("submit_comment");
- if (comment) {
- comment.onkeydown = restrict_comment_size;
- comment.onkeyup = restrict_comment_size;
- }
-
- var form = document.getElementById("submit_form");
-
- if (form) {
- form.onsubmit = validate_input;
- }
-}
-
-// Open a Tegaki canvas and add an image to it
-// @param event A ClickEvent object
-// @param path Path to image (optional)
-function remix(event, path) {
- var file = document.getElementById("draw");
- var clear = document.getElementById("tegaki_clear");
-
- // get image
- var image = new Image();
- image.src = path ? path : this.dataset.path;
-
- image.onload = function() {
- Tegaki.open({
- onDone: function() {
- var dataURL = Tegaki.flatten().toDataURL('image/png');
- //var blob = dataURItoBlob(dataURL);
-
- file.value = dataURL;//blob;
- clear.disabled = false;
- },
- onCancel: function() {},
- width: image.width,
- height: image.height
- });
-
- // Force some data into Tegaki
- Tegaki.layers[0].ctx.drawImage(image, 0, 0);
- Tegaki.addLayer();
- Tegaki.setActiveLayer(Tegaki.layers.length);
- }
-}
-
-// Add ClickEvent listeners to Tegaki buttons
-// @return none
-function prepare_tegaki() {
- var file = document.getElementById("draw");
- var width = document.getElementById("tegaki_width");
- var height = document.getElementById("tegaki_height");
- var draw = document.getElementById("tegaki_draw");
- var clear = document.getElementById("tegaki_clear");
-
- // Standard draw button
- if (draw) {
- draw.onclick = function() {
- Tegaki.open({
- onDone: function() {
- var dataURL = Tegaki.flatten().toDataURL('image/png');
- //var blob = dataURItoBlob(dataURL);
-
- file.value = dataURL;//blob;
- clear.disabled = false;
- },
- onCancel: function() {},
- width: width.value > 2560 ? 2560 : width.value,
- height: height.value > 2560 ? 2560 : height.value
- });
- };
- }
-
- // Standard clear button
- if (clear) {
- clear.onclick = function() {
- Tegaki.destroy();
- file.value = null;
- clear.disabled = true;
- };
- }
-
- // Remix buttons
- var buttons = document.getElementsByClassName("remix");
- for (i=0; i < buttons.length; i++) {
- var button = buttons[i];
- button.onclick = remix;
- }
-
- // Come from board, auto-remix
- var hash = window.location.hash;
- if (hash[1] === "r") {
- var button = document.getElementById(hash.slice(1));
- remix(null, button.dataset.path);
- }
-}
-
-// Check if document has loaded yet
-// @return none
-function ready() {
- if (document.readyState != "loading") {
- quote_thread();
- add_anchor_listeners();
- add_change_listeners()
- add_menu_listeners();
- add_input_constraints();
- prepare_tegaki();
- } else {
- document.addEventListener("DOMContentLoaded", quote_thread);
- document.addEventListener("DOMContentLoaded", add_anchor_listeners);
- document.addEventListener("DOMContentLoaded", add_change_listeners);
- document.addEventListener("DOMContentLoaded", add_menu_listeners);
- document.addEventListener("DOMContentLoaded", add_input_constraints);
- document.addEventListener("DOMContentLoaded", prepare_tegaki);
- }
-}
-
-ready();
diff --git a/misc/website/backend/app/static/js/tegaki/LICENSE b/misc/website/backend/app/static/js/tegaki/LICENSE
deleted file mode 100755
index 54d364f..0000000
--- a/misc/website/backend/app/static/js/tegaki/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Maxime Youdine
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/misc/website/backend/app/static/js/tegaki/README.md b/misc/website/backend/app/static/js/tegaki/README.md
deleted file mode 100755
index 6e3b4e7..0000000
--- a/misc/website/backend/app/static/js/tegaki/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-[Demo](https://desuwa.github.io/tegaki.html)
-
-```javascript
-Tegaki.open({
- onDone: function() { window.open(Tegaki.flatten().toDataURL('image/png')); },
- onCancel: function() { console.log('Closing...')},
- width: 380,
- height: 380
-});
-```
diff --git a/misc/website/backend/app/static/js/tegaki/Rakefile b/misc/website/backend/app/static/js/tegaki/Rakefile
deleted file mode 100755
index 1b88c69..0000000
--- a/misc/website/backend/app/static/js/tegaki/Rakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Encoding.default_external = 'UTF-8'
-
-desc 'Run JShint'
-task :jshint do |t|
- require 'jshintrb'
-
- opts = {
- laxbreak: true,
- boss: true,
- expr: true,
- sub: true,
- browser: true,
- devel: true,
- globalstrict: true,
- unused: true,
- '-W079' => true # no-native-reassign
- }
-
- puts Jshintrb.report("'use strict';" + File.read('tegaki.js'), opts)
-end
diff --git a/misc/website/backend/app/static/js/tegaki/tegaki.js b/misc/website/backend/app/static/js/tegaki/tegaki.js
deleted file mode 100755
index 775951d..0000000
--- a/misc/website/backend/app/static/js/tegaki/tegaki.js
+++ /dev/null
@@ -1,1925 +0,0 @@
-var TegakiBrush = {
- brushFn: function(x, y) {
- var i, ctx, dest, data, len, kernel;
-
- x = 0 | x;
- y = 0 | y;
-
- ctx = Tegaki.ghostCtx;
- dest = ctx.getImageData(x, y, this.brushSize, this.brushSize);
- data = dest.data;
- kernel = this.kernel;
- len = kernel.length;
-
- i = 0;
- while (i < len) {
- data[i] = this.rgb[0]; ++i;
- data[i] = this.rgb[1]; ++i;
- data[i] = this.rgb[2]; ++i;
- data[i] += kernel[i] * (1.0 - data[i] / 255); ++i;
- }
-
- ctx.putImageData(dest, x, y);
- },
-
- commit: function() {
- Tegaki.activeCtx.drawImage(Tegaki.ghostCanvas, 0, 0);
- Tegaki.ghostCtx.clearRect(0, 0,
- Tegaki.ghostCanvas.width, Tegaki.ghostCanvas.height
- );
- },
-
- draw: function(posX, posY, pt) {
- var offset, mx, my, fromX, fromY, dx, dy, err, derr, step, stepAcc;
-
- offset = this.center;
- step = this.stepSize;
- stepAcc = this.stepAcc;
-
- if (pt === true) {
- this.stepAcc = 0;
- this.posX = posX;
- this.posY = posY;
- this.brushFn(posX - offset, posY - offset);
- return;
- }
-
- fromX = this.posX;
- fromY = this.posY;
-
- if (fromX < posX) { dx = posX - fromX; mx = 1; }
- else { dx = fromX - posX; mx = -1; }
- if (fromY < posY) { dy = posY - fromY; my = 1; }
- else { dy = fromY - posY; my = -1; }
-
- err = (dx > dy ? dx : -dy) / 2;
-
- dx = -dx;
-
- while (true) {
- ++stepAcc;
- if (stepAcc > step) {
- this.brushFn(fromX - offset, fromY - offset);
- stepAcc = 0;
- }
- if (fromX === posX && fromY === posY) {
- break;
- }
- derr = err;
- if (derr > dx) { err -= dy; fromX += mx; }
- if (derr < dy) { err -= dx; fromY += my; }
- }
-
- this.stepAcc = stepAcc;
- this.posX = posX;
- this.posY = posY;
- },
-
- generateBrush: function() {
- var i, size, r, brush, ctx, dest, data, len, sqd, sqlen, hs, col, row,
- ecol, erow, a;
-
- size = this.size * 2;
- r = size / 2;
-
- brush = T$.el('canvas');
- brush.width = brush.height = size;
- ctx = brush.getContext('2d');
- dest = ctx.getImageData(0, 0, size, size);
- data = dest.data;
- len = size * size * 4;
- sqlen = Math.sqrt(r * r);
- hs = Math.round(r);
- col = row = -hs;
-
- i = 0;
- while (i < len) {
- if (col >= hs) {
- col = -hs;
- ++row;
- continue;
- }
-
- ecol = col;
- erow = row;
-
- if (ecol < 0) { ecol = -ecol; }
- if (erow < 0) { erow = -erow; }
-
- sqd = Math.sqrt(ecol * ecol + erow * erow);
-
- if (sqd > sqlen) {
- a = 0;
- }
- else {
- a = sqd / sqlen;
- a = (Math.exp(1 - 1 / a) / a);
- a = 255 - ((0 | (a * 100 + 0.5)) / 100) * 255;
- }
-
- if (this.alphaDamp) {
- a *= this.alpha * this.alphaDamp;
- }
- else {
- a *= this.alpha;
- }
-
- data[i + 3] = a;
-
- i += 4;
-
- ++col;
- }
-
- ctx.putImageData(dest, 0, 0);
-
- this.center = r;
- this.brushSize = size;
- this.brush = brush;
- this.kernel = data;
- },
-
- setSize: function(size, noBrush) {
- this.size = size;
- if (!noBrush) this.generateBrush();
- this.stepSize = Math.floor(this.size * this.step);
- },
-
- setAlpha: function(alpha, noBrush) {
- this.alpha = alpha;
- if (!noBrush) this.generateBrush();
- },
-
- setColor: function(color, noBrush) {
- this.rgb = Tegaki.hexToRgb(color);
- if (!noBrush) this.generateBrush();
- },
-
- set: function() {
- this.setAlpha(this.alpha, true);
- this.setSize(this.size, true);
- this.setColor(Tegaki.toolColor, true);
- this.generateBrush();
- }
-};
-
-var TegakiPen = {
- init: function() {
- this.size = 4;
- this.alpha = 0.5;
- this.step = 0.1;
- this.stepAcc = 0;
- },
-
- draw: TegakiBrush.draw,
-
- commit: TegakiBrush.commit,
-
- brushFn: TegakiBrush.brushFn,
-
- generateBrush: function() {
- var size, r, brush, ctx;
-
- size = this.size;
- r = size / 2;
-
- brush = T$.el('canvas');
- brush.width = brush.height = size;
- ctx = brush.getContext('2d');
- ctx.globalAlpha = this.alpha;
- ctx.beginPath();
- ctx.arc(r, r, r, 0, Tegaki.TWOPI, false);
- ctx.fillStyle = '#000000';
- ctx.fill();
- ctx.closePath();
-
- this.center = r;
- this.brushSize = size;
- this.brush = brush;
- this.kernel = ctx.getImageData(0, 0, this.brushSize, this.brushSize).data;
- },
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiPipette = {
- size: 1,
- alpha: 1,
- noCursor: true,
-
- draw: function(posX, posY) {
- var c, ctx;
-
- if (true) {
- ctx = Tegaki.flatten().getContext('2d');
- }
- else {
- ctx = Tegaki.activeCtx;
- }
-
- c = Tegaki.getColorAt(ctx, posX, posY);
-
- Tegaki.setToolColor(c);
- Tegaki.updateUI('color');
- }
-};
-
-var TegakiAirbrush = {
- init: function() {
- this.size = 32;
- this.alpha = 0.5;
- this.alphaDamp = 0.2;
- this.step = 0.25;
- this.stepAcc = 0;
- },
-
- draw: TegakiBrush.draw,
-
- commit: TegakiBrush.commit,
-
- brushFn: TegakiBrush.brushFn,
-
- generateBrush: TegakiBrush.generateBrush,
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiPencil = {
- init: function() {
- this.size = 1;
- this.alpha = 1.0;
- this.step = 0.25;
- this.stepAcc = 0;
- },
-
- draw: TegakiBrush.draw,
-
- commit: TegakiBrush.commit,
-
- brushFn: function(x, y) {
- var i, ctx, dest, data, len, kernel, a;
-
- x = 0 | x;
- y = 0 | y;
-
- ctx = Tegaki.ghostCtx;
- dest = ctx.getImageData(x, y, this.brushSize, this.brushSize);
- data = dest.data;
- kernel = this.kernel;
- len = kernel.length;
-
- a = this.alpha * 255;
-
- i = 0;
- while (i < len) {
- data[i] = this.rgb[0]; ++i;
- data[i] = this.rgb[1]; ++i;
- data[i] = this.rgb[2]; ++i;
- if (kernel[i] > 0) {
- data[i] = a;
- }
- ++i;
- }
-
- ctx.putImageData(dest, x, y);
- },
-
- generateBrush: TegakiPen.generateBrush,
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiEraser = {
- init: function() {
- this.size = 8;
- this.alpha = 1.0;
- this.step = 0.25;
- this.stepAcc = 0;
- },
-
- draw: TegakiBrush.draw,
-
- brushFn: function(x, y) {
- var i, ctx, dest, data, len, kernel;
-
- x = 0 | x;
- y = 0 | y;
-
- ctx = Tegaki.activeCtx;
- dest = ctx.getImageData(x, y, this.brushSize, this.brushSize);
- data = dest.data;
- kernel = this.kernel;
- len = kernel.length;
-
- for (i = 3; i < len; i += 4) {
- if (kernel[i] > 0) {
- data[i] = 0;
- }
- }
-
- ctx.putImageData(dest, x, y);
- },
-
- generateBrush: TegakiPen.generateBrush,
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiDodge = {
- init: function() {
- this.size = 24;
- this.alpha = 0.25;
- this.alphaDamp = 0.05;
- this.step = 0.25;
- this.stepAcc = 0;
- },
-
- brushFn: function(x, y) {
- var i, a, aa, ctx, dest, data, len, kernel;
-
- x = 0 | x;
- y = 0 | y;
-
- ctx = Tegaki.activeCtx;
- dest = ctx.getImageData(x, y, this.brushSize, this.brushSize);
- data = dest.data;
- kernel = this.kernel;
- len = kernel.length;
-
- i = 0;
- while (i < len) {
- aa = kernel[i + 3] * 0.3;
- a = 1 + kernel[i + 3] / 255;
- data[i] = data[i] * a + aa; ++i;
- data[i] = data[i] * a + aa; ++i;
- data[i] = data[i] * a + aa; ++i;
- ++i;
- }
-
- ctx.putImageData(dest, x, y);
- },
-
- draw: TegakiBrush.draw,
-
- generateBrush: TegakiBrush.generateBrush,
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiBurn = {
- init: TegakiDodge.init,
-
- brushFn: function(x, y) {
- var i, a, ctx, dest, data, len, kernel;
-
- x = 0 | x;
- y = 0 | y;
-
- ctx = Tegaki.activeCtx;
- dest = ctx.getImageData(x, y, this.brushSize, this.brushSize);
- data = dest.data;
- kernel = this.kernel;
- len = kernel.length;
-
- i = 0;
- while (i < len) {
- a = 1 - kernel[i + 3] / 255;
- data[i] = data[i] * a; ++i;
- data[i] = data[i] * a; ++i;
- data[i] = data[i] * a; ++i;
- ++i;
- }
-
- ctx.putImageData(dest, x, y);
- },
-
- draw: TegakiBrush.draw,
-
- generateBrush: TegakiDodge.generateBrush,
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiBlur = {
- init: TegakiDodge.init,
-
- brushFn: function(x, y) {
- var i, j, ctx, src, size, srcData, dest, destData, lim, kernel,
- sx, sy, r, g, b, a, aa, acc, kx, ky;
-
- x = 0 | x;
- y = 0 | y;
-
- size = this.brushSize;
- ctx = Tegaki.activeCtx;
- src = ctx.getImageData(x, y, size, size);
- srcData = src.data;
- dest = ctx.createImageData(size, size);
- destData = dest.data;
- kernel = this.kernel;
- lim = size - 1;
-
- for (sx = 0; sx < size; ++sx) {
- for (sy = 0; sy < size; ++sy) {
- r = g = b = a = acc = 0;
- i = (sy * size + sx) * 4;
- if (kernel[(sy * size + sx) * 4 + 3] === 0
- || sx === 0 || sy === 0 || sx === lim || sy === lim) {
- destData[i] = srcData[i]; ++i;
- destData[i] = srcData[i]; ++i;
- destData[i] = srcData[i]; ++i;
- destData[i] = srcData[i];
- continue;
- }
- for (kx = -1; kx < 2; ++kx) {
- for (ky = -1; ky < 2; ++ky) {
- j = ((sy - ky) * size + (sx - kx)) * 4;
- aa = srcData[j + 3];
- acc += aa;
- r += srcData[j] * aa; ++j;
- g += srcData[j] * aa; ++j;
- b += srcData[j] * aa; ++j;
- a += srcData[j];
- }
- }
- destData[i] = r / acc; ++i;
- destData[i] = g / acc; ++i;
- destData[i] = b / acc; ++i;
- destData[i] = a / 9;
- }
- }
-
- ctx.putImageData(dest, x, y);
- },
-
- draw: TegakiBrush.draw,
-
- generateBrush: TegakiDodge.generateBrush,
-
- setSize: TegakiBrush.setSize,
-
- setAlpha: TegakiBrush.setAlpha,
-
- setColor: TegakiBrush.setColor,
-
- set: TegakiBrush.set
-};
-
-var TegakiHistory = {
- maxSize: 10,
-
- undoStack: [],
- redoStack: [],
-
- pendingAction: null,
-
- clear: function() {
- this.undoStack = [];
- this.redoStack = [];
- this.pendingAction = null;
- },
-
- push: function(action) {
- this.undoStack.push(action);
-
- if (this.undoStack.length > this.maxSize) {
- this.undoStack.shift();
- }
-
- if (this.redoStack.length > 0) {
- this.redoStack = [];
- }
- },
-
- undo: function() {
- var action;
-
- if (!this.undoStack.length) {
- return;
- }
-
- action = this.undoStack.pop();
- action.undo();
-
- this.redoStack.push(action);
- },
-
- redo: function() {
- var action;
-
- if (!this.redoStack.length) {
- return;
- }
-
- action = this.redoStack.pop();
- action.redo();
-
- this.undoStack.push(action);
- }
-};
-
-var TegakiHistoryActions = {
- Draw: function(layerId) {
- this.canvasBefore = null;
- this.canvasAfter = null;
- this.layerId = layerId;
- },
-
- DestroyLayers: function(indices, layers) {
- this.indices = indices;
- this.layers = layers;
- this.canvasBefore = null;
- this.canvasAfter = null;
- this.layerId = null;
- },
-
- AddLayer: function(layerId) {
- this.layerId = layerId;
- },
-
- MoveLayer: function(layerId, up) {
- this.layerId = layerId;
- this.up = up;
- }
-};
-
-TegakiHistoryActions.Draw.prototype.addCanvasState = function(canvas, type) {
- if (type) {
- this.canvasAfter = T$.copyCanvas(canvas);
- }
- else {
- this.canvasBefore = T$.copyCanvas(canvas);
- }
-};
-
-TegakiHistoryActions.Draw.prototype.exec = function(type) {
- var i, layer;
-
- for (i in Tegaki.layers) {
- layer = Tegaki.layers[i];
-
- if (layer.id === this.layerId) {
- layer.ctx.clearRect(0, 0, layer.canvas.width, layer.canvas.height);
- layer.ctx.drawImage(type ? this.canvasAfter: this.canvasBefore, 0, 0);
- }
- }
-};
-
-TegakiHistoryActions.Draw.prototype.undo = function() {
- this.exec(0);
-};
-
-TegakiHistoryActions.Draw.prototype.redo = function() {
- this.exec(1);
-};
-
-TegakiHistoryActions.DestroyLayers.prototype.undo = function() {
- var i, ii, len, layers, idx, layer, frag;
-
- layers = new Array(len);
-
- for (i = 0; (idx = this.indices[i]) !== undefined; ++i) {
- layers[idx] = this.layers[i];
- }
-
- i = ii = 0;
- len = Tegaki.layers.length + this.layers.length;
- frag = T$.frag();
-
- while (i < len) {
- if (!layers[i]) {
- layer = layers[i] = Tegaki.layers[ii];
- Tegaki.layersCnt.removeChild(layer.canvas);
- ++ii;
- }
-
- if (this.layerId && layer.id === this.layerId) {
- layer.ctx.clearRect(0, 0, layer.canvas.width, layer.canvas.height);
- layer.ctx.drawImage(this.canvasBefore, 0, 0);
- }
-
- frag.appendChild(layers[i].canvas);
-
- ++i;
- }
-
- Tegaki.layersCnt.insertBefore(frag, Tegaki.canvas.nextElementSibling);
-
- Tegaki.layers = layers;
-
- Tegaki.setActiveLayer();
-
- Tegaki.rebuildLayerCtrl();
-};
-
-TegakiHistoryActions.DestroyLayers.prototype.redo = function() {
- var i, layer, ids = [];
-
- for (i = 0; layer = this.layers[i]; ++i) {
- ids.push(layer.id);
- }
-
- if (this.layerId) {
- ids.push(this.layerId);
- Tegaki.mergeLayers(ids);
- }
- else {
- Tegaki.deleteLayers(ids);
- }
-};
-
-TegakiHistoryActions.MoveLayer.prototype.undo = function() {
- Tegaki.setActiveLayer(this.layerId);
- Tegaki.moveLayer(this.layerId, !this.up);
-};
-
-TegakiHistoryActions.MoveLayer.prototype.redo = function() {
- Tegaki.setActiveLayer(this.layerId);
- Tegaki.moveLayer(this.layerId, this.up);
-};
-
-TegakiHistoryActions.AddLayer.prototype.undo = function() {
- Tegaki.deleteLayers([this.layerId]);
- Tegaki.layerIndex--;
-};
-
-TegakiHistoryActions.AddLayer.prototype.redo = function() {
- Tegaki.addLayer();
- Tegaki.setActiveLayer();
-};
-
-var T$ = {
- docEl: document.documentElement,
-
- id: function(id) {
- return document.getElementById(id);
- },
-
- cls: function(klass, root) {
- return (root || document).getElementsByClassName(klass);
- },
-
- on: function(o, e, h) {
- o.addEventListener(e, h, false);
- },
-
- off: function(o, e, h) {
- o.removeEventListener(e, h, false);
- },
-
- el: function(name) {
- return document.createElement(name);
- },
-
- frag: function() {
- return document.createDocumentFragment();
- },
-
- extend: function(destination, source) {
- for (var key in source) {
- destination[key] = source[key];
- }
- },
-
- selectedOptions: function(el) {
- var i, opt, sel;
-
- if (el.selectedOptions) {
- return el.selectedOptions;
- }
-
- sel = [];
-
- for (i = 0; opt = el.options[i]; ++i) {
- if (opt.selected) {
- sel.push(opt);
- }
- }
-
- return sel;
- },
-
- copyCanvas: function(source) {
- var canvas = T$.el('canvas');
- canvas.width = source.width;
- canvas.height = source.height;
- canvas.getContext('2d').drawImage(source, 0, 0);
-
- return canvas;
- }
-};
-
-var TegakiStrings = {
- // Messages
- badDimensions: 'Invalid dimensions.',
- promptWidth: 'Canvas width in pixels',
- promptHeight: 'Canvas height in pixels',
- confirmDelLayers: 'Delete selected layers?',
- errorMergeOneLayer: 'You need to select at least 2 layers.',
- confirmMergeLayers: 'Merge selected layers?',
- errorLoadImage: 'Could not load the image.',
- noActiveLayer: 'No active layer.',
- hiddenActiveLayer: 'The active layer is not visible.',
- confirmCancel: 'Are you sure? Your work will be lost.',
- confirmChangeCanvas: 'Changing the canvas will clear all layers and history.',
-
- // UI
- color: 'Color',
- size: 'Size',
- alpha: 'Opacity',
- layers: 'Layers',
- addLayer: 'Add layer',
- delLayers: 'Delete layers',
- mergeLayers: 'Merge layers',
- showHideLayer: 'Toggle visibility',
- moveLayerUp: 'Move up',
- moveLayerDown: 'Move down',
- tool: 'Tool',
- changeCanvas: 'Change canvas',
- blank: 'Blank',
- newCanvas: 'New',
- undo: 'Undo',
- redo: 'Redo',
- close: 'Close',
- finish: 'Finish',
-
- // Tools
- pen: 'Pen',
- pencil: 'Pencil',
- airbrush: 'Airbrush',
- pipette: 'Pipette',
- dodge: 'Dodge',
- burn: 'Burn',
- blur: 'Blur',
- eraser: 'Eraser'
-};
-
-var Tegaki = {
- VERSION: '0.0.1',
-
- bg: null,
- cnt: null,
- canvas: null,
- ctx: null,
- layers: [],
- layersCnt: null,
- ghostCanvas: null,
- ghostCtx: null,
- activeCtx: null,
- activeLayer: null,
- layerIndex: null,
-
- isPainting: false,
- isErasing: false,
- isColorPicking: false,
-
- offsetX: 0,
- offsetY: 0,
-
- TWOPI: 2 * Math.PI,
-
- tools: {
- pencil: TegakiPencil,
- pen: TegakiPen,
- airbrush: TegakiAirbrush,
- pipette: TegakiPipette,
- dodge: TegakiDodge,
- burn: TegakiBurn,
- blur: TegakiBlur,
- eraser: TegakiEraser
- },
-
- tool: null,
- toolColor: '#000000',
-
- bgColor: '#ffffff',
- maxSize: 32,
- maxLayers: 25,
- baseWidth: null,
- baseHeight: null,
-
- onDoneCb: null,
- onCancelCb: null,
-
- open: function(opts) {
- var bg, cnt, el, el2, tool, lbl, btn, ctrl, canvas, grp, self = Tegaki;
-
- if (self.bg) {
- self.resume();
- return;
- }
-
- if (opts.bgColor) {
- self.bgColor = opts.bgColor;
- }
-
- self.onDoneCb = opts.onDone;
- self.onCancelCb = opts.onCancel;
-
- cnt = T$.el('div');
- cnt.id = 'tegaki-cnt';
-
- canvas = T$.el('canvas');
- canvas.id = 'tegaki-canvas';
- canvas.width = self.baseWidth = opts.width;
- canvas.height = self.baseHeight = opts.height;
-
- el = T$.el('div');
- el.id = 'tegaki-layers';
- el.appendChild(canvas);
- self.layersCnt = el;
-
- cnt.appendChild(el);
-
- ctrl = T$.el('div');
- ctrl.id = 'tegaki-ctrl';
-
- // Colorpicker
- grp = T$.el('div');
- grp.className = 'tegaki-ctrlgrp';
- el = T$.el('input');
- el.id = 'tegaki-color';
- el.value = self.toolColor;
- try {
- el.type = 'color';
- } catch(e) {
- el.type = 'text';
- }
- lbl = T$.el('div');
- lbl.className = 'tegaki-label';
- lbl.textContent = TegakiStrings.color;
- grp.appendChild(lbl);
- T$.on(el, 'change', self.onColorChange);
- grp.appendChild(el);
- ctrl.appendChild(grp);
-
- // Size control
- grp = T$.el('div');
- grp.className = 'tegaki-ctrlgrp';
- el = T$.el('input');
- el.id = 'tegaki-size';
- el.min = 1;
- el.max = self.maxSize;
- el.type = 'range';
- lbl = T$.el('div');
- lbl.className = 'tegaki-label';
- lbl.textContent = TegakiStrings.size;
- grp.appendChild(lbl);
- T$.on(el, 'change', self.onSizeChange);
- grp.appendChild(el);
- ctrl.appendChild(grp);
-
- // Alpha control
- grp = T$.el('div');
- grp.className = 'tegaki-ctrlgrp';
- el = T$.el('input');
- el.id = 'tegaki-alpha';
- el.min = 0;
- el.max = 1;
- el.step = 0.01;
- el.type = 'range';
- lbl = T$.el('div');
- lbl.className = 'tegaki-label';
- lbl.textContent = TegakiStrings.alpha;
- grp.appendChild(lbl);
- T$.on(el, 'change', self.onAlphaChange);
- grp.appendChild(el);
- ctrl.appendChild(grp);
-
- // Layer control
- grp = T$.el('div');
- grp.className = 'tegaki-ctrlgrp';
- grp.id = 'tegaki-layer-grp';
- el = T$.el('select');
- el.id = 'tegaki-layer';
- el.multiple = true;
- el.size = 3;
- lbl = T$.el('div');
- lbl.className = 'tegaki-label';
- lbl.textContent = TegakiStrings.layers;
- grp.appendChild(lbl);
- T$.on(el, 'change', self.onLayerChange);
- grp.appendChild(el);
- el = T$.el('span');
- el.title = TegakiStrings.addLayer;
- el.className = 'tegaki-icon tegaki-plus';
- T$.on(el, 'click', self.onLayerAdd);
- grp.appendChild(el);
- el = T$.el('span');
- el.title = TegakiStrings.delLayers;
- el.className = 'tegaki-icon tegaki-minus';
- T$.on(el, 'click', self.onLayerDelete);
- grp.appendChild(el);
- el = T$.el('span');
- el.id = 'tegaki-layer-visibility';
- el.title = TegakiStrings.showHideLayer;
- el.className = 'tegaki-icon tegaki-eye';
- T$.on(el, 'click', self.onLayerVisibilityChange);
- grp.appendChild(el);
- el = T$.el('span');
- el.id = 'tegaki-layer-merge';
- el.title = TegakiStrings.mergeLayers;
- el.className = 'tegaki-icon tegaki-level-down';
- T$.on(el, 'click', self.onMergeLayers);
- grp.appendChild(el);
- el = T$.el('span');
- el.id = 'tegaki-layer-up';
- el.title = TegakiStrings.moveLayerUp;
- el.setAttribute('data-up', '1');
- el.className = 'tegaki-icon tegaki-up-open';
- T$.on(el, 'click', self.onMoveLayer);
- grp.appendChild(el);
- el = T$.el('span');
- el.id = 'tegaki-layer-down';
- el.title = TegakiStrings.moveLayerDown;
- el.className = 'tegaki-icon tegaki-down-open';
- T$.on(el, 'click', self.onMoveLayer);
- grp.appendChild(el);
- ctrl.appendChild(grp);
-
- // Tool selector
- grp = T$.el('div');
- grp.className = 'tegaki-ctrlgrp';
- el = T$.el('select');
- el.id = 'tegaki-tool';
- for (tool in Tegaki.tools) {
- el2 = T$.el('option');
- el2.value = tool;
- el2.textContent = TegakiStrings[tool];
- el.appendChild(el2);
- }
- lbl = T$.el('div');
- lbl.className = 'tegaki-label';
- lbl.textContent = TegakiStrings.tool;
- grp.appendChild(lbl);
- T$.on(el, 'change', self.onToolChange);
- grp.appendChild(el);
- ctrl.appendChild(grp);
-
- cnt.appendChild(ctrl);
-
- el = T$.el('div');
- el.id = 'tegaki-menu-bar';
-
- if (opts.canvasOptions) {
- btn = T$.el('select');
- btn.id = 'tegaki-canvas-select';
- btn.title = TegakiStrings.changeCanvas;
- btn.innerHTML = '';
- opts.canvasOptions(btn);
- T$.on(btn, 'change', Tegaki.onCanvasSelected);
- T$.on(btn, 'focus', Tegaki.onCanvasSelectFocused);
- el.appendChild(btn);
- }
-
- btn = T$.el('span');
- btn.className = 'tegaki-tb-btn';
- btn.textContent = TegakiStrings.newCanvas;
- T$.on(btn, 'click', Tegaki.onNewClick);
- el.appendChild(btn);
-
- btn = T$.el('span');
- btn.className = 'tegaki-tb-btn';
- btn.textContent = TegakiStrings.undo;
- T$.on(btn, 'click', Tegaki.onUndoClick);
- el.appendChild(btn);
-
- btn = T$.el('span');
- btn.className = 'tegaki-tb-btn';
- btn.textContent = TegakiStrings.redo;
- T$.on(btn, 'click', Tegaki.onRedoClick);
- el.appendChild(btn);
-
- btn = T$.el('span');
- btn.className = 'tegaki-tb-btn';
- btn.textContent = TegakiStrings.close;
- T$.on(btn, 'click', Tegaki.onCancelClick);
- el.appendChild(btn);
-
- btn = T$.el('span');
- btn.id = 'tegaki-finish-btn';
- btn.className = 'tegaki-tb-btn';
- btn.textContent = TegakiStrings.finish;
- T$.on(btn, 'click', Tegaki.onDoneClick);
- el.appendChild(btn);
-
- cnt.appendChild(el);
-
- bg = T$.el('div');
- bg.id = 'tegaki';
- self.bg = bg;
- bg.appendChild(cnt);
- document.body.appendChild(bg);
- document.body.classList.add('tegaki-backdrop');
-
- el = T$.el('canvas');
- el.id = 'tegaki-ghost-layer';
- el.width = canvas.width;
- el.height = canvas.height;
- self.ghostCanvas = el;
- self.ghostCtx = el.getContext('2d');
-
- self.cnt = cnt;
- self.centerCnt();
-
- self.canvas = canvas;
-
- self.ctx = canvas.getContext('2d');
- self.ctx.fillStyle = self.bgColor;
- self.ctx.fillRect(0, 0, opts.width, opts.height);
-
- self.addLayer();
-
- self.setActiveLayer();
-
- self.initTools();
-
- self.setTool('pencil');
-
- self.updateUI();
-
- self.updateCursor();
- self.updatePosOffset();
-
- T$.on(self.bg, 'mousemove', self.onMouseMove);
- T$.on(self.bg, 'mousedown', self.onMouseDown);
- T$.on(self.layersCnt, 'contextmenu', self.onDummy);
-
- T$.on(document, 'mouseup', self.onMouseUp);
- T$.on(window, 'resize', self.updatePosOffset);
- T$.on(window, 'scroll', self.updatePosOffset);
- },
-
- initTools: function() {
- var tool;
-
- for (tool in Tegaki.tools) {
- (tool = Tegaki.tools[tool]) && tool.init && tool.init();
- }
- },
-
- hexToRgb: function(hex) {
- var c = hex.match(/^#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i);
-
- if (c) {
- return [
- parseInt(c[1], 16),
- parseInt(c[2], 16),
- parseInt(c[3], 16)
- ];
- }
-
- return null;
- },
-
- centerCnt: function() {
- var aabb, cnt;
-
- cnt = Tegaki.cnt;
- aabb = cnt.getBoundingClientRect();
-
- if (aabb.width > T$.docEl.clientWidth || aabb.height > T$.docEl.clientHeight) {
- if (aabb.width > T$.docEl.clientWidth) {
- cnt.classList.add('tegaki-overflow-x');
- }
- if (aabb.height > T$.docEl.clientHeight) {
- cnt.classList.add('tegaki-overflow-y');
- }
- }
- else {
- cnt.classList.remove('tegaki-overflow-x');
- cnt.classList.remove('tegaki-overflow-y');
- }
-
- cnt.style.marginTop = -Math.round(aabb.height / 2) + 'px';
- cnt.style.marginLeft = -Math.round(aabb.width / 2) + 'px';
- },
-
- getCursorPos: function(e, axis) {
- if (axis === 0) {
- return e.clientX + window.pageXOffset + Tegaki.bg.scrollLeft - Tegaki.offsetX;
- }
- else {
- return e.clientY + window.pageYOffset + Tegaki.bg.scrollTop - Tegaki.offsetY;
- }
- },
-
- resume: function() {
- Tegaki.bg.classList.remove('tegaki-hidden');
- document.body.classList.add('tegaki-backdrop');
-
- Tegaki.centerCnt();
- Tegaki.updatePosOffset();
-
- T$.on(document, 'mouseup', Tegaki.onMouseUp);
- T$.on(window, 'resize', Tegaki.updatePosOffset);
- T$.on(window, 'scroll', Tegaki.updatePosOffset);
- },
-
- hide: function() {
- Tegaki.bg.classList.add('tegaki-hidden');
- document.body.classList.remove('tegaki-backdrop');
-
- T$.off(document, 'mouseup', Tegaki.onMouseUp);
- T$.off(window, 'resize', Tegaki.updatePosOffset);
- T$.off(window, 'scroll', Tegaki.updatePosOffset);
- },
-
- destroy: function() {
- T$.off(Tegaki.bg, 'mousemove', Tegaki.onMouseMove);
- T$.off(Tegaki.bg, 'mousedown', Tegaki.onMouseDown);
- T$.off(Tegaki.layersCnt, 'contextmenu', Tegaki.onDummy);
-
- T$.off(document, 'mouseup', Tegaki.onMouseUp);
- T$.off(window, 'resize', Tegaki.updatePosOffset);
- T$.off(window, 'scroll', Tegaki.updatePosOffset);
-
- Tegaki.bg.parentNode.removeChild(Tegaki.bg);
-
- TegakiHistory.clear();
-
- document.body.classList.remove('tegaki-backdrop');
-
- Tegaki.bg = null;
- Tegaki.cnt = null;
- Tegaki.canvas = null;
- Tegaki.ctx = null;
- Tegaki.layers = [];
- Tegaki.layerIndex = 0;
- Tegaki.activeCtx = null;
- },
-
- flatten: function() {
- var i, layer, canvas, ctx;
-
- canvas = T$.el('canvas');
- canvas.width = Tegaki.canvas.width;
- canvas.height = Tegaki.canvas.height;
-
- ctx = canvas.getContext('2d');
-
- ctx.drawImage(Tegaki.canvas, 0, 0);
-
- for (i = 0; layer = Tegaki.layers[i]; ++i) {
- if (layer.canvas.classList.contains('tegaki-hidden')) {
- continue;
- }
- ctx.drawImage(layer.canvas, 0, 0);
- }
-
- return canvas;
- },
-
- updateUI: function(type) {
- var i, ary, el, tool = Tegaki.tool;
-
- ary = type ? [type] : ['size', 'alpha', 'color'];
-
- for (i = 0; type = ary[i]; ++i) {
- el = T$.id('tegaki-' + type);
- el.value = type === 'color' ? Tegaki.toolColor : tool[type];
-
- if (el.type === 'range') {
- el.previousElementSibling.setAttribute('data-value', tool[type]);
- }
- }
- },
-
- rebuildLayerCtrl: function() {
- var i, layer, sel, opt;
-
- sel = T$.id('tegaki-layer');
-
- sel.textContent = '';
-
- for (i = Tegaki.layers.length - 1; layer = Tegaki.layers[i]; i--) {
- opt = T$.el('option');
- opt.value = layer.id;
- opt.textContent = layer.name;
- sel.appendChild(opt);
- }
- },
-
- getColorAt: function(ctx, posX, posY) {
- var rgba = ctx.getImageData(posX, posY, 1, 1).data;
-
- return '#'
- + ('0' + rgba[0].toString(16)).slice(-2)
- + ('0' + rgba[1].toString(16)).slice(-2)
- + ('0' + rgba[2].toString(16)).slice(-2);
- },
-
- renderCircle: function(r) {
- var i, canvas, ctx, d, e, x, y, dx, dy, idata, data, c, color;
-
- e = 1 - r;
- dx = 0;
- dy = -2 * r;
- x = 0;
- y = r;
- d = 33;
- c = 16;
-
- canvas = T$.el('canvas');
- canvas.width = canvas.height = d;
- ctx = canvas.getContext('2d');
- idata = ctx.getImageData(0, 0, ctx.canvas.width, ctx.canvas.height);
- data = idata.data;
-
- color = 255;
-
- data[(c + (c + r) * d) * 4 + 3] = color;
- data[(c + (c - r) * d) * 4 + 3] = color;
- data[(c + r + c * d) * 4 + 3] = color;
- data[(c - r + c * d) * 4 + 3] = color;
-
- while (x < y) {
- if (e >= 0) {
- y--;
- dy += 2;
- e += dy;
- }
-
- ++x;
- dx += 2;
- e += dx;
-
- data[(c + x + (c + y) * d) * 4 + 3] = color;
- data[(c - x + (c + y) * d) * 4 + 3] = color;
- data[(c + x + (c - y) * d) * 4 + 3] = color;
- data[(c - x + (c - y) * d) * 4 + 3] = color;
- data[(c + y + (c + x) * d) * 4 + 3] = color;
- data[(c - y + (c + x) * d) * 4 + 3] = color;
- data[(c + y + (c - x) * d) * 4 + 3] = color;
- data[(c - y + (c - x) * d) * 4 + 3] = color;
- }
-
- if (r > 0) {
- for (i = 0; i < 3; ++i) {
- data[(c + c * d) * 4 + i] = 127;
- }
- data[(c + c * d) * 4 + i] = color;
- }
-
- ctx.putImageData(idata, 0, 0);
-
- return canvas;
- },
-
- setToolSize: function(size) {
- Tegaki.tool.setSize && Tegaki.tool.setSize(size);
- Tegaki.updateCursor();
- },
-
- setToolAlpha: function(alpha) {
- Tegaki.tool.setAlpha && Tegaki.tool.setAlpha(alpha);
- },
-
- setToolColor: function(color) {
- Tegaki.toolColor = color;
- Tegaki.tool.setColor && Tegaki.tool.setColor(color);
- Tegaki.updateCursor();
- },
-
- setTool: function(tool) {
- tool = Tegaki.tools[tool];
- Tegaki.tool = tool;
- tool.set && tool.set();
- },
-
- debugDumpPixelData: function(canvas) {
- var i, idata, data, len, out, el;
-
- idata = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
- data = idata.data;
- len = data.length;
-
- out = '';
-
- for (i = 0; i < len; i += 4) {
- out += data[i] + ' ' + data[i+1] + ' ' + data[i+2] + ' ' + data[i+3] + '%0a';
- }
-
- el = document.createElement('a');
- el.href = 'data:,' + out;
- el.download = 'dump.txt';
- document.body.appendChild(el);
- el.click();
- document.body.removeChild(el);
- },
-
- debugDrawColors: function(sat) {
- var i, ctx, grad, a;
-
- Tegaki.resizeCanvas(360, 360);
-
- ctx = Tegaki.activeCtx;
- a = ctx.globalAlpha;
- ctx.globalAlpha = 1;
-
- ctx.fillStyle = '#000000';
- ctx.fillRect(0, 0, 360, 360);
-
- for (i = 0; i < 360; ++i) {
- if (sat) {
- grad = ctx.createLinearGradient(0, 0, 10, 360);
- grad.addColorStop(0, 'hsl(' + i + ', 0%, ' + '50%)');
- grad.addColorStop(1, 'hsl(' + i + ', 100%, ' + '50%)');
- ctx.strokeStyle = grad;
- }
- else {
- ctx.strokeStyle = 'hsl(' + i + ', 100%, ' + '50%)';
- }
- ctx.beginPath();
- ctx.moveTo(i, 0);
- ctx.lineTo(i, 360);
- ctx.stroke();
- ctx.closePath();
- }
-
- if (!sat) {
- grad = ctx.createLinearGradient(0, 0, 10, 360);
- grad.addColorStop(0, '#000000');
- grad.addColorStop(1, 'rgba(0,0,0,0)');
- ctx.fillStyle = grad;
- ctx.fillRect(0, 0, 360, 360);
- }
-
- ctx.globalAlpha = a;
- },
-
- onNewClick: function() {
- var width, height, tmp;
-
- width = prompt(TegakiStrings.promptWidth, Tegaki.canvas.width);
- if (!width) { return; }
-
- height = prompt(TegakiStrings.promptHeight, Tegaki.canvas.height);
- if (!height) { return; }
-
- width = +width;
- height = +height;
-
- if (width < 1 || height < 1) {
- alert(TegakiStrings.badDimensions);
- return;
- }
-
- tmp = {};
- Tegaki.copyContextState(Tegaki.activeCtx, tmp);
- Tegaki.resizeCanvas(width, height);
- Tegaki.copyContextState(tmp, Tegaki.activeCtx);
-
- TegakiHistory.clear();
- Tegaki.centerCnt();
- Tegaki.updatePosOffset();
- },
-
- onUndoClick: function() {
- TegakiHistory.undo();
- },
-
- onRedoClick: function() {
- TegakiHistory.redo();
- },
-
- onDoneClick: function() {
- Tegaki.hide();
- Tegaki.onDoneCb();
- },
-
- onCancelClick: function() {
- if (!confirm(TegakiStrings.confirmCancel)) {
- return;
- }
-
- Tegaki.destroy();
- Tegaki.onCancelCb();
- },
-
- onColorChange: function() {
- Tegaki.setToolColor(this.value);
- },
-
- onSizeChange: function() {
- this.previousElementSibling.setAttribute('data-value', this.value);
- Tegaki.setToolSize(+this.value);
- },
-
- onAlphaChange: function() {
- this.previousElementSibling.setAttribute('data-value', this.value);
- Tegaki.setToolAlpha(+this.value);
- },
-
- onLayerChange: function() {
- var selectedOptions = T$.selectedOptions(this);
-
- if (selectedOptions.length > 1) {
- Tegaki.activeLayer = null;
- }
- else {
- Tegaki.setActiveLayer(+this.value);
- }
- },
-
- onLayerAdd: function() {
- TegakiHistory.push(Tegaki.addLayer());
- Tegaki.setActiveLayer();
- },
-
- onLayerDelete: function() {
- var i, ary, sel, opt, selectedOptions, action;
-
- sel = T$.id('tegaki-layer');
-
- selectedOptions = T$.selectedOptions(sel);
-
- if (Tegaki.layers.length === selectedOptions.length) {
- return;
- }
-
- if (!confirm(TegakiStrings.confirmDelLayers)) {
- return;
- }
-
- if (selectedOptions.length > 1) {
- ary = [];
-
- for (i = 0; opt = selectedOptions[i]; ++i) {
- ary.push(+opt.value);
- }
- }
- else {
- ary = [+sel.value];
- }
-
- action = Tegaki.deleteLayers(ary);
-
- TegakiHistory.push(action);
- },
-
- onLayerVisibilityChange: function() {
- var i, ary, sel, opt, flag, selectedOptions;
-
- sel = T$.id('tegaki-layer');
-
- selectedOptions = T$.selectedOptions(sel);
-
- if (selectedOptions.length > 1) {
- ary = [];
-
- for (i = 0; opt = selectedOptions[i]; ++i) {
- ary.push(+opt.value);
- }
- }
- else {
- ary = [+sel.value];
- }
-
- flag = !Tegaki.getLayerById(ary[0]).visible;
-
- Tegaki.setLayerVisibility(ary, flag);
- },
-
- onMergeLayers: function() {
- var i, ary, sel, opt, selectedOptions, action;
-
- sel = T$.id('tegaki-layer');
-
- selectedOptions = T$.selectedOptions(sel);
-
- if (selectedOptions.length > 1) {
- ary = [];
-
- for (i = 0; opt = selectedOptions[i]; ++i) {
- ary.push(+opt.value);
- }
- }
- else {
- ary = [+sel.value];
- }
-
- if (ary.length < 2) {
- alert(TegakiStrings.errorMergeOneLayer);
- return;
- }
-
- if (!confirm(TegakiStrings.confirmMergeLayers)) {
- return;
- }
-
- action = Tegaki.mergeLayers(ary);
-
- TegakiHistory.push(action);
- },
-
- onMoveLayer: function(e) {
- var id, action, sel;
-
- sel = T$.id('tegaki-layer');
-
- id = +sel.options[sel.selectedIndex].value;
-
- if (action = Tegaki.moveLayer(id, e.target.hasAttribute('data-up'))) {
- TegakiHistory.push(action);
- }
- },
-
- onToolChange: function() {
- Tegaki.setTool(this.value);
- Tegaki.updateUI();
- Tegaki.updateCursor();
- },
-
- onCanvasSelected: function() {
- var img;
-
- if (!confirm(TegakiStrings.confirmChangeCanvas)) {
- this.selectedIndex = +this.getAttribute('data-current');
- return;
- }
-
- if (this.value === '0') {
- Tegaki.ctx.fillStyle = Tegaki.bgColor;
- Tegaki.ctx.fillRect(0, 0, Tegaki.baseWidth, Tegaki.baseHeight);
- }
- else {
- img = T$.el('img');
- img.onload = Tegaki.onImageLoaded;
- img.onerror = Tegaki.onImageError;
- this.disabled = true;
- img.src = this.value;
- }
- },
-
- onImageLoaded: function() {
- var el, tmp = {};
-
- el = T$.id('tegaki-canvas-select');
- el.setAttribute('data-current', el.selectedIndex);
- el.disabled = false;
-
- Tegaki.copyContextState(Tegaki.activeCtx, tmp);
- Tegaki.resizeCanvas(this.naturalWidth, this.naturalHeight);
- Tegaki.activeCtx.drawImage(this, 0, 0);
- Tegaki.copyContextState(tmp, Tegaki.activeCtx);
-
- TegakiHistory.clear();
- Tegaki.centerCnt();
- Tegaki.updatePosOffset();
- },
-
- onImageError: function() {
- var el;
-
- el = T$.id('tegaki-canvas-select');
- el.selectedIndex = +el.getAttribute('data-current');
- el.disabled = false;
-
- alert(TegakiStrings.errorLoadImage);
- },
-
- resizeCanvas: function(width, height) {
- var i, layer;
-
- Tegaki.canvas.width = width;
- Tegaki.canvas.height = height;
- Tegaki.ghostCanvas.width = width;
- Tegaki.ghostCanvas.height = height;
-
- Tegaki.ctx.fillStyle = Tegaki.bgColor;
- Tegaki.ctx.fillRect(0, 0, width, height);
-
- for (i = 0; layer = Tegaki.layers[i]; ++i) {
- Tegaki.layersCnt.removeChild(layer.canvas);
- }
-
- Tegaki.activeCtx = null;
- Tegaki.layers = [];
- Tegaki.layerIndex = 0;
- T$.id('tegaki-layer').textContent = '';
-
- Tegaki.addLayer();
- Tegaki.setActiveLayer();
- },
-
- getLayerIndex: function(id) {
- var i, layer, layers = Tegaki.layers;
-
- for (i = 0; layer = layers[i]; ++i) {
- if (layer.id === id) {
- return i;
- }
- }
-
- return -1;
- },
-
- getLayerById: function(id) {
- return Tegaki.layers[Tegaki.getLayerIndex(id)];
- },
-
- addLayer: function() {
- var id, cnt, opt, canvas, layer, nodes, last;
-
- canvas = T$.el('canvas');
- canvas.className = 'tegaki-layer';
- canvas.width = Tegaki.canvas.width;
- canvas.height = Tegaki.canvas.height;
-
- id = ++Tegaki.layerIndex;
-
- layer = {
- id: id,
- name: 'Layer ' + id,
- canvas: canvas,
- ctx: canvas.getContext('2d'),
- visible: true,
- empty: true,
- opacity: 1.0
- };
-
- Tegaki.layers.push(layer);
-
- cnt = T$.id('tegaki-layer');
- opt = T$.el('option');
- opt.value = layer.id;
- opt.textContent = layer.name;
- cnt.insertBefore(opt, cnt.firstElementChild);
-
- nodes = T$.cls('tegaki-layer', Tegaki.layersCnt);
-
- if (nodes.length) {
- last = nodes[nodes.length - 1];
- }
- else {
- last = Tegaki.canvas;
- }
-
- Tegaki.layersCnt.insertBefore(canvas, last.nextElementSibling);
-
- return new TegakiHistoryActions.AddLayer(id);
- },
-
- deleteLayers: function(ids) {
- var i, id, len, sel, idx, indices, layers;
-
- sel = T$.id('tegaki-layer');
-
- indices = [];
- layers = [];
-
- for (i = 0, len = ids.length; i < len; ++i) {
- id = ids[i];
- idx = Tegaki.getLayerIndex(id);
- sel.removeChild(sel.options[Tegaki.layers.length - 1 - idx]);
- Tegaki.layersCnt.removeChild(Tegaki.layers[idx].canvas);
-
- indices.push(idx);
- layers.push(Tegaki.layers[idx]);
-
- Tegaki.layers.splice(idx, 1);
- }
-
- Tegaki.setActiveLayer();
-
- return new TegakiHistoryActions.DestroyLayers(indices, layers);
- },
-
- mergeLayers: function(ids) {
- var i, id, sel, idx, canvasBefore, destId, dest, action;
-
- sel = T$.id('tegaki-layer');
-
- destId = ids.pop();
- idx = Tegaki.getLayerIndex(destId);
- dest = Tegaki.layers[idx].ctx;
-
- canvasBefore = T$.copyCanvas(Tegaki.layers[idx].canvas);
-
- for (i = ids.length - 1; i >= 0; i--) {
- id = ids[i];
- idx = Tegaki.getLayerIndex(id);
- dest.drawImage(Tegaki.layers[idx].canvas, 0, 0);
- }
-
- action = Tegaki.deleteLayers(ids);
- action.layerId = destId;
- action.canvasBefore = canvasBefore;
- action.canvasAfter = T$.copyCanvas(dest.canvas);
-
- Tegaki.setActiveLayer(destId);
-
- return action;
- },
-
- moveLayer: function(id, up) {
- var idx, sel, opt, canvas, tmp, tmpId;
-
- sel = T$.id('tegaki-layer');
- idx = Tegaki.getLayerIndex(id);
-
- canvas = Tegaki.layers[idx].canvas;
- opt = sel.options[Tegaki.layers.length - 1 - idx];
-
- if (up) {
- if (!Tegaki.ghostCanvas.nextElementSibling) { return false; }
- canvas.parentNode.insertBefore(canvas,
- Tegaki.ghostCanvas.nextElementSibling.nextElementSibling
- );
- opt.parentNode.insertBefore(opt, opt.previousElementSibling);
- tmpId = idx + 1;
- }
- else {
- if (canvas.previousElementSibling.id === 'tegaki-canvas') { return false; }
- canvas.parentNode.insertBefore(canvas, canvas.previousElementSibling);
- opt.parentNode.insertBefore(opt, opt.nextElementSibling.nextElementSibling);
- tmpId = idx - 1;
- }
-
- Tegaki.updateGhostLayerPos();
-
- tmp = Tegaki.layers[tmpId];
- Tegaki.layers[tmpId] = Tegaki.layers[idx];
- Tegaki.layers[idx] = tmp;
-
- Tegaki.activeLayer = tmpId;
-
- return new TegakiHistoryActions.MoveLayer(id, up);
- },
-
- setLayerVisibility: function(ids, flag) {
- var i, len, sel, idx, layer, optIdx;
-
- sel = T$.id('tegaki-layer');
- optIdx = Tegaki.layers.length - 1;
-
- for (i = 0, len = ids.length; i < len; ++i) {
- idx = Tegaki.getLayerIndex(ids[i]);
- layer = Tegaki.layers[idx];
- layer.visible = flag;
-
- if (flag) {
- sel.options[optIdx - idx].classList.remove('tegaki-strike');
- layer.canvas.classList.remove('tegaki-hidden');
- }
- else {
- sel.options[optIdx - idx].classList.add('tegaki-strike');
- layer.canvas.classList.add('tegaki-hidden');
- }
- }
- },
-
- setActiveLayer: function(id) {
- var ctx, idx;
-
- idx = id ? Tegaki.getLayerIndex(id) : Tegaki.layers.length - 1;
-
- if (idx < 0 || idx > Tegaki.maxLayers) {
- return;
- }
-
- ctx = Tegaki.layers[idx].ctx;
-
- if (Tegaki.activeCtx) {
- Tegaki.copyContextState(Tegaki.activeCtx, ctx);
- }
-
- Tegaki.activeCtx = ctx;
- Tegaki.activeLayer = idx;
- T$.id('tegaki-layer').selectedIndex = Tegaki.layers.length - idx - 1;
-
- Tegaki.updateGhostLayerPos();
- },
-
- updateGhostLayerPos: function() {
- Tegaki.layersCnt.insertBefore(
- Tegaki.ghostCanvas,
- Tegaki.activeCtx.canvas.nextElementSibling
- );
- },
-
- copyContextState: function(src, dest) {
- var i, p, props = [
- 'lineCap', 'lineJoin', 'strokeStyle', 'fillStyle', 'globalAlpha',
- 'lineWidth', 'globalCompositeOperation'
- ];
-
- for (i = 0; p = props[i]; ++i) {
- dest[p] = src[p];
- }
- },
-
- updateCursor: function() {
- var radius;
-
- radius = 0 | (Tegaki.tool.size / 2);
-
- if (Tegaki.tool.noCursor || radius < 1) {
- Tegaki.layersCnt.style.cursor = 'default';
- return;
- }
-
- Tegaki.layersCnt.style.cursor = 'url("'
- + Tegaki.renderCircle(radius).toDataURL('image/png')
- + '") 16 16, default';
- },
-
- updatePosOffset: function() {
- var aabb = Tegaki.canvas.getBoundingClientRect();
- Tegaki.offsetX = aabb.left + window.pageXOffset + Tegaki.cnt.scrollLeft;
- Tegaki.offsetY = aabb.top + window.pageYOffset + Tegaki.cnt.scrollTop;
- },
-
- onMouseMove: function(e) {
- if (Tegaki.isPainting) {
- Tegaki.tool.draw(Tegaki.getCursorPos(e, 0), Tegaki.getCursorPos(e, 1));
- }
- else if (Tegaki.isColorPicking) {
- TegakiPipette.draw(Tegaki.getCursorPos(e, 0), Tegaki.getCursorPos(e, 1));
- }
- },
-
- onMouseDown: function(e) {
- if (e.target.parentNode === Tegaki.layersCnt) {
- if (Tegaki.activeLayer === null) {
- alert(TegakiStrings.noActiveLayer);
- return;
- }
- if (!Tegaki.layers[Tegaki.activeLayer].visible) {
- alert(TegakiStrings.hiddenActiveLayer);
- return;
- }
- }
- else if (e.target !== Tegaki.bg) {
- return;
- }
-
- if (e.which === 3 || e.altKey) {
- Tegaki.isColorPicking = true;
- TegakiPipette.draw(Tegaki.getCursorPos(e, 0), Tegaki.getCursorPos(e, 1));
- }
- else {
- Tegaki.isPainting = true;
- TegakiHistory.pendingAction = new TegakiHistoryActions.Draw(
- Tegaki.layers[Tegaki.activeLayer].id
- );
- TegakiHistory.pendingAction.addCanvasState(Tegaki.activeCtx.canvas, 0);
- Tegaki.tool.draw(Tegaki.getCursorPos(e, 0), Tegaki.getCursorPos(e, 1), true);
- }
- },
-
- onMouseUp: function(e) {
- if (Tegaki.isPainting) {
- Tegaki.tool.commit && Tegaki.tool.commit();
- TegakiHistory.pendingAction.addCanvasState(Tegaki.activeCtx.canvas, 1);
- TegakiHistory.push(TegakiHistory.pendingAction);
- Tegaki.isPainting = false;
- }
- else if (Tegaki.isColorPicking) {
- e.preventDefault();
- Tegaki.isColorPicking = false;
- }
- },
-
- onDummy: function(e) {
- e.preventDefault();
- e.stopPropagation();
- }
-};
diff --git a/misc/website/backend/app/static/op_audio.png b/misc/website/backend/app/static/op_audio.png
deleted file mode 100755
index e6f3f5995da20f22da7784673453c41a4f37e68b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 19745
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
" .. err .. "
\n" - end - out = out .. [[ - -<%= page_title %>
- -- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-diff --git a/misc/website/backend/app/src/views/admin/announcement.etlua b/misc/website/backend/app/src/views/admin/announcement.etlua deleted file mode 100755 index 780c76d..0000000 --- a/misc/website/backend/app/src/views/admin/announcement.etlua +++ /dev/null @@ -1,30 +0,0 @@ -
-
-
diff --git a/misc/website/backend/app/src/views/admin/board.etlua b/misc/website/backend/app/src/views/admin/board.etlua
deleted file mode 100755
index 9248868..0000000
--- a/misc/website/backend/app/src/views/admin/board.etlua
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/login.etlua b/misc/website/backend/app/src/views/admin/login.etlua
deleted file mode 100755
index 7194224..0000000
--- a/misc/website/backend/app/src/views/admin/login.etlua
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/page.etlua b/misc/website/backend/app/src/views/admin/page.etlua
deleted file mode 100755
index 4ab4e75..0000000
--- a/misc/website/backend/app/src/views/admin/page.etlua
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/admin/success.etlua b/misc/website/backend/app/src/views/admin/success.etlua
deleted file mode 100755
index 2e96583..0000000
--- a/misc/website/backend/app/src/views/admin/success.etlua
+++ /dev/null
@@ -1,3 +0,0 @@
-Success
-<%= action %>
-[<%= i18n("return") %>] diff --git a/misc/website/backend/app/src/views/admin/user.etlua b/misc/website/backend/app/src/views/admin/user.etlua deleted file mode 100755 index dd0a932..0000000 --- a/misc/website/backend/app/src/views/admin/user.etlua +++ /dev/null @@ -1,71 +0,0 @@ -
-
-
diff --git a/misc/website/backend/app/src/views/archive.etlua b/misc/website/backend/app/src/views/archive.etlua
deleted file mode 100755
index a5d7a57..0000000
--- a/misc/website/backend/app/src/views/archive.etlua
+++ /dev/null
@@ -1,49 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% render('views.fragments.announcements') %>
--[<%= i18n('return') %>] -[<%= i18n('catalog') %>] -[<%= i18n('bottom') %>] -
-
- - <%= i18n('arc_display', { - n_thread = #threads, - p_thread = i18n('threads', { count=#threads }), - n_day = days, - p_day = i18n('days', { count=days }) - }) %> - -
-| <%= i18n('arc_number') %> | -<%= i18n('arc_name') %> | -<%= i18n('arc_excerpt') %> | -<%= i18n('arc_replies') %> | -- |
| <%= thread.op.post_id %> | -<%= thread.op.name %> <%= thread.op.trip %> | -- <% if thread.op.subject then %> - <%= thread.op.subject %>: - <% end %> - <%- thread.op.comment %> - | -<%= thread.replies %> | -[<%= i18n('arc_view') %>] | -
-[<%= i18n('return') %>] -[<%= i18n('catalog') %>] -[<%= i18n('top') %>] -
diff --git a/misc/website/backend/app/src/views/banned.etlua b/misc/website/backend/app/src/views/banned.etlua deleted file mode 100755 index c94fc89..0000000 --- a/misc/website/backend/app/src/views/banned.etlua +++ /dev/null @@ -1,8 +0,0 @@ -
<%= page_title %>
-
-
-
diff --git a/misc/website/backend/app/src/views/board.etlua b/misc/website/backend/app/src/views/board.etlua
deleted file mode 100755
index 8590492..0000000
--- a/misc/website/backend/app/src/views/board.etlua
+++ /dev/null
@@ -1,36 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% render('views.fragments.form_submit') %>
-<% render('views.fragments.announcements') %>
-<%= i18n('ban_reason') %>
-<%= reason %>
-<%- i18n('ban_expire', { expire=''..expire..'' }) %>
-<%- i18n('ban_ip', { ip=''..ip..'' }) %>
--[<%= i18n('catalog') %>] -[<%= i18n('archive') %>] -[<%= i18n('refresh') %>] -
-<% for _, thread in ipairs(threads) do %> -
-<%
- local posts = thread.posts or {}
- for i=#posts, 1, -1 do
- local post = posts[i]
- local op = posts[#posts]
- if post.post_id == op.post_id then
- render('views.fragments.op_content', { thread=thread, post=post, posts=posts, is_board=true })
- else
- render('views.fragments.post_content', { thread=thread, post=post, posts=posts, is_board=true, op=op })
- end
- end
-%>
-
--<% end %> -
- <% for i=1, pages do %>
- <% if i == params.page then %>
- [<%= i %>]
- <% else %>
- [<%= i %>]
- <% end %>
- <% end %>
- [<%= i18n('catalog') %>]
- [<%= i18n('archive') %>]
-
diff --git a/misc/website/backend/app/src/views/catalog.etlua b/misc/website/backend/app/src/views/catalog.etlua
deleted file mode 100755
index 108ea8d..0000000
--- a/misc/website/backend/app/src/views/catalog.etlua
+++ /dev/null
@@ -1,34 +0,0 @@
-<% render('views.fragments.board_title') %>
-<% render('views.fragments.form_submit') %>
-<% render('views.fragments.announcements') %>
--[<%= i18n('return') %>] -[<%= i18n('archive') %>] -[<%= i18n('bottom') %>] -[<%= i18n('refresh') %>] -
-<% for t, thread in ipairs(threads) do %> - -<% end %> -
-[<%= i18n('return') %>] -[<%= i18n('archive') %>] -[<%= i18n('top') %>] -[<%= i18n('refresh') %>] -
diff --git a/misc/website/backend/app/src/views/code_404.etlua b/misc/website/backend/app/src/views/code_404.etlua deleted file mode 100755 index bd5f8f1..0000000 --- a/misc/website/backend/app/src/views/code_404.etlua +++ /dev/null @@ -1,2 +0,0 @@ -
<%= page_title %>
- diff --git a/misc/website/backend/app/src/views/fragments/announcements.etlua b/misc/website/backend/app/src/views/fragments/announcements.etlua deleted file mode 100755 index 9a4f08c..0000000 --- a/misc/website/backend/app/src/views/fragments/announcements.etlua +++ /dev/null @@ -1,6 +0,0 @@ -<% if #announcements > 0 then %> --<% for _, announcement in ipairs(announcements) do %> -
<%= announcement.text %>
-<% end %> -<% end %> diff --git a/misc/website/backend/app/src/views/fragments/board_title.etlua b/misc/website/backend/app/src/views/fragments/board_title.etlua deleted file mode 100755 index 0c6358b..0000000 --- a/misc/website/backend/app/src/views/fragments/board_title.etlua +++ /dev/null @@ -1,6 +0,0 @@ -
-
diff --git a/misc/website/backend/app/src/views/fragments/copyright.etlua b/misc/website/backend/app/src/views/fragments/copyright.etlua
deleted file mode 100755
index 2a06a9d..0000000
--- a/misc/website/backend/app/src/views/fragments/copyright.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= page_title %>
- <% if board.subtext then %> -<%= board.subtext %>
- <% end %> -
-
diff --git a/misc/website/backend/app/src/views/fragments/error.etlua b/misc/website/backend/app/src/views/fragments/error.etlua
deleted file mode 100755
index cb0bdb3..0000000
--- a/misc/website/backend/app/src/views/fragments/error.etlua
+++ /dev/null
@@ -1,6 +0,0 @@
-<%- i18n('copy_software', { - software = ''..software..'', - version = 'v'..version - }) %>
-<%- i18n('copy_download', { - github = 'GitHub' - }) %>
-
-
diff --git a/misc/website/backend/app/src/views/fragments/form_ban.etlua b/misc/website/backend/app/src/views/fragments/form_ban.etlua
deleted file mode 100755
index f4d72bf..0000000
--- a/misc/website/backend/app/src/views/fragments/form_ban.etlua
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_delete.etlua b/misc/website/backend/app/src/views/fragments/form_delete.etlua
deleted file mode 100755
index 2a3855c..0000000
--- a/misc/website/backend/app/src/views/fragments/form_delete.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_locale.etlua b/misc/website/backend/app/src/views/fragments/form_locale.etlua
deleted file mode 100755
index 456cbb4..0000000
--- a/misc/website/backend/app/src/views/fragments/form_locale.etlua
+++ /dev/null
@@ -1,10 +0,0 @@
-/!\ ALART /!\
-<% for _, err in ipairs(errors) do %> -<%= err %>
-<% end %> -
-
-
diff --git a/misc/website/backend/app/src/views/fragments/form_lock.etlua b/misc/website/backend/app/src/views/fragments/form_lock.etlua
deleted file mode 100755
index 29693d2..0000000
--- a/misc/website/backend/app/src/views/fragments/form_lock.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_override.etlua b/misc/website/backend/app/src/views/fragments/form_override.etlua
deleted file mode 100755
index 1d19005..0000000
--- a/misc/website/backend/app/src/views/fragments/form_override.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_remix.etlua b/misc/website/backend/app/src/views/fragments/form_remix.etlua
deleted file mode 100755
index 6bfae28..0000000
--- a/misc/website/backend/app/src/views/fragments/form_remix.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if thread then %>
-
-<% else %>
-
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/form_report.etlua b/misc/website/backend/app/src/views/fragments/form_report.etlua
deleted file mode 100755
index d1bc1a6..0000000
--- a/misc/website/backend/app/src/views/fragments/form_report.etlua
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_save.etlua b/misc/website/backend/app/src/views/fragments/form_save.etlua
deleted file mode 100755
index 734841f..0000000
--- a/misc/website/backend/app/src/views/fragments/form_save.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_sticky.etlua b/misc/website/backend/app/src/views/fragments/form_sticky.etlua
deleted file mode 100755
index 94e144b..0000000
--- a/misc/website/backend/app/src/views/fragments/form_sticky.etlua
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/form_submit.etlua b/misc/website/backend/app/src/views/fragments/form_submit.etlua
deleted file mode 100755
index 46ce1da..0000000
--- a/misc/website/backend/app/src/views/fragments/form_submit.etlua
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
diff --git a/misc/website/backend/app/src/views/fragments/list_boards.etlua b/misc/website/backend/app/src/views/fragments/list_boards.etlua
deleted file mode 100755
index d6ac290..0000000
--- a/misc/website/backend/app/src/views/fragments/list_boards.etlua
+++ /dev/null
@@ -1,16 +0,0 @@
-<% if boards then %>
-- * - <%= i18n("form_required") %> -
-- <%- - i18n("form_readme", { -- FIXME - rules = 'Rules', - faq = 'FAQ' - }) - %> -
-
- [ <%= i18n('index') %> ]
- <% local group = 1 %>
- <% for i, board in ipairs(boards) do %>
- <% local sub = sub_page or '' %>
- <% if board.group ~= group then %>
- <% group = board.group %> ] [
- <% else %>
- <%= i == 1 and '[' or '/' %>
- <% end %>
- <%= board.name %>
- <%= i == #boards and ']' or '' %>
- <% end %>
-
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/op_content.etlua b/misc/website/backend/app/src/views/fragments/op_content.etlua
deleted file mode 100755
index 512dc90..0000000
--- a/misc/website/backend/app/src/views/fragments/op_content.etlua
+++ /dev/null
@@ -1,71 +0,0 @@
-
- <% if post.file_name then %>
-
-<% if thread.hidden and thread.hidden.posts > 0 then %>
-
- <%= i18n("file") %>:
- <%
- if post.file_name:len() > 35 then
- local short = string.sub(post.file_name, 1, 25)
- local ext = post.file_name:match("^.+(%..+)$")
- local name = string.format("%s(...)%s", short, ext)
- %>
- <%= name %>
- <% else %>
- <%= post.file_name %>
- <% end%>
- (<%= post.file_size %> KB<%= post.file_dimensions %><%= post.file_duration %>)
-
-
-
-
- <% end %>
-
- <% render("views.fragments.post_menu", { post=post, op=true }) %>
- <% if post.subject then %>
- <%= post.subject %>
- <% end %>
- <%= post.name %>
- <% if post.trip then %>
- <%= post.trip %>
- <% end %>
- <%= post.timestamp %>
- No.<%= post.post_id %>
- <% if thread.sticky or thread.lock or thread.save or thread.size_override then %>
-
- <% if thread.sticky then %>
- 📌
- <% end %>
- <% if thread.lock then %>
- 🔒
- <% end %>
- <% if thread.save then %>
- 💾
- <% end %>
- <% if thread.size_override then %>
- ✔️
- <% end %>
-
- <% end %>
- <% if is_board then %>
- [<%= i18n('reply') %>]
- <% end %>
-
-
- <%-
- i18n("post_hidden", {
- n_post = thread.hidden.posts,
- p_post = i18n("posts", { count=thread.hidden.posts }),
- n_file = thread.hidden.files,
- p_file = i18n("files", { count=thread.hidden.files }),
- click = "Click here"
- })
- %>
-
-<% end %>
diff --git a/misc/website/backend/app/src/views/fragments/post_content.etlua b/misc/website/backend/app/src/views/fragments/post_content.etlua
deleted file mode 100755
index 385bad2..0000000
--- a/misc/website/backend/app/src/views/fragments/post_content.etlua
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
diff --git a/misc/website/backend/app/src/views/fragments/post_menu.etlua b/misc/website/backend/app/src/views/fragments/post_menu.etlua
deleted file mode 100755
index acdbbee..0000000
--- a/misc/website/backend/app/src/views/fragments/post_menu.etlua
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/misc/website/backend/app/src/views/fragments/return_board.etlua b/misc/website/backend/app/src/views/fragments/return_board.etlua
deleted file mode 100755
index 87b193e..0000000
--- a/misc/website/backend/app/src/views/fragments/return_board.etlua
+++ /dev/null
@@ -1,3 +0,0 @@
-
- <% render("views.fragments.post_menu", { post=post }) %>
- <% if post.subject then %>
- <%= post.subject %>
- <% end %>
- <%= post.name %>
- <% if post.trip then %>
- <%= post.trip %>
- <% end %>
- <%= post.timestamp %>
- No.<%= post.post_id %>
-
- <% if post.file_name then %>
-
- <%= i18n("file") %>:
- <%
- if post.file_name:len() > 35 then
- local short = string.sub(post.file_name, 1, 25)
- local ext = post.file_name:match("^.+(%..+)$")
- local name = string.format("%s(...)%s", short, ext)
- %>
- <%= name %>
- <% else %>
- <%= post.file_name %>
- <% end%>
- (<%= post.file_size %> KB<%= post.file_dimensions %><%= post.file_duration %>)
-
-
-
-
- <% end %>
-
- <%- post.comment %>
- <% if post.banned then %>
-
-(<%= board.ban_message %>)
- <% end %> -
- [ <%= i18n("return_board") %> ]
-
diff --git a/misc/website/backend/app/src/views/fragments/return_thread.etlua b/misc/website/backend/app/src/views/fragments/return_thread.etlua
deleted file mode 100755
index 77e5193..0000000
--- a/misc/website/backend/app/src/views/fragments/return_thread.etlua
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [ <%= i18n("return_thread") %> ]
-
diff --git a/misc/website/backend/app/src/views/index.etlua b/misc/website/backend/app/src/views/index.etlua
deleted file mode 100755
index a50ad8e..0000000
--- a/misc/website/backend/app/src/views/index.etlua
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= site_name %>
-
-
diff --git a/misc/website/backend/app/src/views/install.etlua b/misc/website/backend/app/src/views/install.etlua
deleted file mode 100755
index a049b6d..0000000
--- a/misc/website/backend/app/src/views/install.etlua
+++ /dev/null
@@ -1,132 +0,0 @@
-<%= i18n('index_boards') %>
- <% for _, board in ipairs(boards) do %> -
- /<%= board.name %>/ - <%= board.title %>
- <% if board.subtext then %>
- <%= board.subtext %>
- <% end %>
- <% if board.rules then %>
-
- <% end %>
-<%= i18n('rules') %>
- <%- markdown(board.rules) %> - <% end %> -Install Lapis-chan
- -Welcome to Lapis-chan v1.0.0!
- -
-
-
diff --git a/misc/website/backend/app/src/views/layout.etlua b/misc/website/backend/app/src/views/layout.etlua
deleted file mode 100755
index 3c8f594..0000000
--- a/misc/website/backend/app/src/views/layout.etlua
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
- <% if board then %>
-
- <% if board.draw then %>
-
-
- <% end %>
- <% end %>
-
-
- <% render('views.fragments.form_locale') %>
- <% if session.name then %>
- [<%= i18n('logout') %>]
- <% end %>
-
- <% content_for('inner') %>
- <% render('views.fragments.list_boards') %>
- <% render('views.fragments.copyright') %>
-
-
diff --git a/misc/website/backend/app/src/views/page.etlua b/misc/website/backend/app/src/views/page.etlua
deleted file mode 100755
index f4abf3a..0000000
--- a/misc/website/backend/app/src/views/page.etlua
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= page.name %>
-<%- page.content %> diff --git a/misc/website/backend/app/src/views/rules.etlua b/misc/website/backend/app/src/views/rules.etlua deleted file mode 100755 index 4c9ccc3..0000000 --- a/misc/website/backend/app/src/views/rules.etlua +++ /dev/null @@ -1,17 +0,0 @@ -<%= i18n("rules") %>
-| <%= i18n("board") %> | -<%= i18n("rules") %> | -
| <%= board.title %> | -<%- board.rules %> | -
-[<%= i18n('return') %>] -[<%= i18n('catalog') %>] -[<%= i18n('bottom') %>] -[<%= i18n('refresh') %>] -
-
-<% for i, post in ipairs(posts) do
- if i == 1 then
- render('views.fragments.op_content', { thread=thread, post=post })
- else
- render('views.fragments.post_content', { thread=thread, post=post, op=posts[1] })
- end
-end %>
-
--[<%= i18n('return') %>] -[<%= i18n('catalog') %>] -[<%= i18n('top') %>] -[<%= i18n('refresh') %>] -
diff --git a/misc/website/backend/app/static/banned.jpg b/misc/website/backend/app/static/banned.jpg deleted file mode 100755 index 16579efd71e5ae5b2af2db0b5c0adb051436fcc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10148 zcmb6
(<%= board.ban_message %>)
- <% end %> -