Revert "dynamic: DynamicContentPostList: Link using UrlProvider::pageByTitle()"

This reverts commit 9b35e43161.

config.cpp

@@ -85,6 +85,7 @@ Config::Config(const std::map<std::string, std::string> &map)
 	this->urls.linkindex = required("linkindex");
 	this->urls.linklogout = required("linklogout");
 	this->urls.linkpage = required("linkpage");
+	this->urls.linkpagebytitle = required("linkpagebytitle");
 	this->urls.linkrecent = required("linkrecent");
 	this->urls.linkrevision = required("linkrevision");
 	this->urls.linksettings = required("linksettings");

config.h

@@ -26,6 +26,7 @@ struct ConfigUrls
 	std::string linkallcats;
 	std::string linkshere;
 	std::string linkpage;
+	std::string linkpagebytitle;
 	std::string linkrevision;
 	std::string linkhistory;
 	std::string linkedit;

database/pagedao.h

@@ -13,6 +13,7 @@ class PageDao
 	virtual bool exists(std::string page) const = 0;
 	virtual bool exists(unsigned int id) const = 0;
 	virtual std::optional<Page> find(std::string name) = 0;
+	virtual std::optional<Page> findByTitle(std::string title) = 0;
 	virtual std::optional<Page> find(unsigned int id) = 0;
 	virtual std::vector<std::string> getPageList(QueryOption option) = 0;
 	virtual std::vector<std::string> fetchCategories(std::string pagename, QueryOption option) = 0;

database/pagedaosqlite.cpp

@@ -52,6 +52,26 @@ std::optional<Page> PageDaoSqlite::find(std::string name)
 	}
 }
 
+std::optional<Page> PageDaoSqlite::findByTitle(std::string title)
+{
+	Page result;
+	try
+	{
+		auto ps = *db << "SELECT id, name, title, lastrevision, visible FROM page WHERE title = ?";
+		ps << title >> std::tie(result.pageid, result.name, result.title, result.current_revision, result.listed);
+	}
+	catch(const sqlite::errors::no_rows &e)
+	{
+		return {};
+	}
+	catch(sqlite::sqlite_exception &e)
+	{
+		throwFrom(e);
+	}
+
+	return result;
+}
+
 std::optional<Page> PageDaoSqlite::find(unsigned int id)
 {
 	Page result;

database/pagedaosqlite.h

@@ -20,6 +20,7 @@ class PageDaoSqlite : public PageDao, protected SqliteDao
 	bool exists(std::string name) const override;
 	void save(const Page &page) override;
 	std::optional<Page> find(std::string name) override;
+	std::optional<Page> findByTitle(std::string title) override;
 	std::optional<Page> find(unsigned int id) override;
 	std::vector<std::string> getPageList(QueryOption option) override;
 	std::vector<std::string> fetchCategories(std::string pagename, QueryOption option) override;

dynamic/dynamiccontent.h

@@ -11,9 +11,15 @@ class DynamicContent
 	Database *database;
 	UrlProvider *urlProvider;
 
+	std::string argument;
+
   public:
 	DynamicContent(Template &templ, Database &database, UrlProvider &urlProvider);
 	virtual std::string render() = 0;
+	virtual void setArgument(std::string argument)
+	{
+		this->argument = argument;
+	}
 	virtual ~DynamicContent()
 	{
 	}

dynamic/dynamiccontentgetvar.cpp

@@ -0,0 +1,11 @@
+#include "dynamiccontentgetvar.h"
+
+std::string DynamicContentGetVar::render()
+{
+	return (*this->map)[this->argument];
+}
+
+void DynamicContentGetVar::setMap(std::map<std::string, std::string> &map)
+{
+	this->map = &map;
+}

dynamic/dynamiccontentgetvar.h

@@ -0,0 +1,19 @@
+#ifndef DYNAMICCONTENTGETVAR_H
+#define DYNAMICCONTENTGETVAR_H
+
+#include "dynamiccontent.h"
+class DynamicContentGetVar : public DynamicContent
+{
+  private:
+	std::map<std::string, std::string> *map;
+
+  public:
+	using DynamicContent::DynamicContent;
+
+	// DynamicContent interface
+  public:
+	std::string render();
+	void setMap(std::map<std::string, std::string> &map);
+};
+
+#endif // DYNAMICCONTENTGETVAR_H

dynamic/dynamiccontentincludepage.cpp

@@ -0,0 +1,12 @@
+#include "dynamiccontentincludepage.h"
+#include "../parser.h"
+std::string DynamicContentIncludePage::render()
+{
+	auto revisionDao = this->database->createRevisionDao();
+	auto rev = revisionDao->getCurrentForPage(this->argument);
+	if(rev)
+	{
+		return rev->content;
+	}
+	return {};
+}

dynamic/dynamiccontentincludepage.h

@@ -0,0 +1,12 @@
+#ifndef DYNAMICCONTENTINCLUDEPAGE_H
+#define DYNAMICCONTENTINCLUDEPAGE_H
+#include "dynamiccontent.h"
+class DynamicContentIncludePage : public DynamicContent
+{
+  public:
+	using DynamicContent::DynamicContent;
+
+	std::string render();
+};
+
+#endif // DYNAMICCONTENTINCLUDEPAGE_H

dynamic/dynamiccontentpostlist.cpp

@@ -1,11 +1,6 @@
 #include <chrono>
 #include "dynamiccontentpostlist.h"
 
-void DynamicContentPostList::setCategory(std::string catname)
-{
-	this->catname = catname;
-}
-
 std::string DynamicContentPostList::render()
 {
 	auto categoryDao = this->database->createCategoryDao();
@@ -13,7 +8,7 @@ std::string DynamicContentPostList::render()
 	auto revisionDao = this->database->createRevisionDao();
 	QueryOption option;
 	option.includeInvisible = false;
-	auto members = categoryDao->fetchMembers(this->catname, option);
+	auto members = categoryDao->fetchMembers(this->argument, option);
 	std::vector<std::pair<std::string, time_t>> pageList;
 	for(std::string &member : members)
 	{

dynamic/dynamiccontentpostlist.h

@@ -4,12 +4,8 @@
 #include "dynamiccontent.h"
 class DynamicContentPostList : public DynamicContent
 {
-  private:
-	std::string catname;
-
   public:
 	using DynamicContent::DynamicContent;
-	void setCategory(std::string catname);
 	std::string render() override;
 };
 

dynamic/dynamiccontentsetvar.cpp

@@ -0,0 +1,21 @@
+#include "dynamiccontentsetvar.h"
+
+std::string DynamicContentSetVar::render()
+{
+	auto result = utils::split(this->argument, '=');
+	if(result.size() == 2)
+	{
+		this->map->emplace(std::make_pair(result[0], result[1]));
+	}
+	return {};
+}
+
+void DynamicContentSetVar::setArgument(std::string argument)
+{
+	this->argument = argument;
+}
+
+void DynamicContentSetVar::setMap(std::map<std::string, std::string> &map)
+{
+	this->map = &map;
+}

dynamic/dynamiccontentsetvar.h

@@ -0,0 +1,17 @@
+#ifndef DYNAMCCONTENTPUSHVAR_H
+#define DYNAMCCONTENTPUSHVAR_H
+#include "dynamiccontent.h"
+class DynamicContentSetVar : public DynamicContent
+{
+  private:
+	std::map<std::string, std::string> *map;
+
+  public:
+	using DynamicContent::DynamicContent;
+
+	std::string render();
+	void setArgument(std::string argument);
+	void setMap(std::map<std::string, std::string> &map);
+};
+
+#endif // DYNAMCCONTENTPUSHVAR_H

handlers/handlerfeedgenerator.cpp

@@ -21,6 +21,10 @@ std::vector<HandlerFeedGenerator::EntryRevisionPair> HandlerFeedGenerator::fetch
 		auto categoryDao = this->database->createCategoryDao();
 		for(std::string cat : categories)
 		{
+			if(!categoryDao->find(cat))
+			{
+				throw std::runtime_error("No such category");
+			}
 			auto catmembers = categoryDao->fetchMembers(cat, option);
 			std::copy(catmembers.begin(), catmembers.end(), std::inserter(members, members.end()));
 		}
@@ -43,8 +47,8 @@ std::vector<HandlerFeedGenerator::EntryRevisionPair> HandlerFeedGenerator::fetch
 	return result;
 }
 
-Response HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGenerator::EntryRevisionPair> &entries,
-											std::string filter)
+std::string HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGenerator::EntryRevisionPair> &entries,
+											   std::string filter)
 {
 
 	std::stringstream stream;
@@ -56,9 +60,10 @@ Response HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGenerat
 	auto revisionDao = this->database->createRevisionDao();
 	auto pageDao = this->database->createPageDao();
 
+	std::string subtitle = filter;
 	if(utils::trim(filter).empty())
 	{
-		filter = "All pages";
+		subtitle = "All pages";
 	}
 
 	for(const EntryRevisionPair &entry : entries)
@@ -72,6 +77,7 @@ Response HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGenerat
 			newestPublished = initialRevision.timestamp;
 		}
 		std::string entryPublished = utils::formatLocalDate(initialRevision.timestamp, dateformat) + "Z";
+		std::string entryUpdated = utils::formatLocalDate(current.timestamp, dateformat) + "Z";
 		std::string entryurl =
 			this->urlProvider->combine({this->urlProvider->rootUrl(), this->urlProvider->page(page.name)});
 		TemplatePage atomentry = this->templ->getPage("feeds/atomentry");
@@ -79,21 +85,19 @@ Response HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGenerat
 		atomentry.setVar("entryurl", utils::html_xss(entryurl));
 		atomentry.setVar("entryid", utils::html_xss(entryurl));
 		atomentry.setVar("entrypublished", entryPublished);
+		atomentry.setVar("entryupdated", entryUpdated);
 		Parser parser;
 		atomentry.setVar("entrycontent", utils::html_xss(parser.parse(*pageDao, *this->urlProvider, current.content)));
 		stream << atomentry.render();
 	}
 	stream << atomfooter;
 	TemplatePage atomheader = this->templ->getPage("feeds/atomheader");
-	atomheader.setVar("subtitle", filter);
-	atomheader.setVar("atomfeeduniqueid", utils::html_xss(this->urlProvider->atomFeed(filter)));
+	atomheader.setVar("subtitle", subtitle);
+	std::string selflink = utils::html_xss(this->urlProvider->atomFeed(filter));
+	atomheader.setVar("atomfeeduniqueid", selflink);
+	atomheader.setVar("atomselflink", selflink);
 	atomheader.setVar("atomfeedupdate", utils::formatLocalDate(newestPublished, dateformat) + "Z");
-
-	Response result;
-	result.setStatus(200);
-	result.setContentType("application/atom+xml");
-	result.setBody(atomheader.render() + stream.str());
-	return result;
+	return atomheader.render() + stream.str();
 }
 
 Response HandlerFeedGenerator::handleRequest(const Request &r)
@@ -103,12 +107,26 @@ Response HandlerFeedGenerator::handleRequest(const Request &r)
 	{
 		std::string type = r.get("type");
 		std::string categories = r.get("cats");
-
-		auto entries = fetchEntries(utils::split(categories, ','));
 		if(type == "atom")
 		{
 			std::string filter = categories;
-			response = generateAtom(entries, filter);
+			Response result;
+			result.setStatus(200);
+			result.setContentType("application/atom+xml");
+			std::string cacheKey = "feed:atom:" + filter;
+			auto cached = this->cache->get(cacheKey);
+			if(cached)
+			{
+				result.setBody(cached.value());
+			}
+			else
+			{
+				auto entries = fetchEntries(utils::split(categories, ','));
+				std::string feed = generateAtom(entries, filter);
+				result.setBody(feed);
+				this->cache->put(cacheKey, feed);
+			}
+			response = result;
 		}
 		else
 		{

handlers/handlerfeedgenerator.h

@@ -9,7 +9,7 @@ class HandlerFeedGenerator : public Handler
 
   protected:
 	std::vector<EntryRevisionPair> fetchEntries(std::vector<std::string> categories);
-	Response generateAtom(const std::vector<EntryRevisionPair> &entries, std::string atomtitle);
+	std::string generateAtom(const std::vector<EntryRevisionPair> &entries, std::string atomtitle);
 	Response generateRss(const std::vector<EntryRevisionPair> &entries);
 
   public:

handlers/handlerpage.cpp

@@ -27,7 +27,18 @@ Response HandlerPage::handle(const Request &r)
 	auto pageDao = this->database->createPageDao();
 	if(pagename.empty())
 	{
-		return errorResponse("No page given", "No page given to request");
+		std::string title = r.get("title");
+		if(title.empty())
+		{
+			return errorResponse("No page given", "No page given to request");
+		}
+		title = utils::strreplace(title, "-", " ");
+		auto page = pageDao->findByTitle(title);
+		if(!page)
+		{
+			return errorResponse("No page by such title", "No page with such title exists");
+		}
+		pagename = page->name;
 	}
 
 	if(pageMustExist() && !pageDao->exists(pagename))

handlers/handlerpagedelete.cpp

@@ -45,6 +45,7 @@ Response HandlerPageDelete::handleRequest(PageDao &pageDao, std::string pagename
 		{
 			pageDao.deletePage(pagename);
 			this->cache->removePrefix("page:"); // TODO: overkill?
+			this->cache->removePrefix("feed:");
 			return Response::redirectTemporarily(this->urlProvider->index());
 		}
 		TemplatePage delPage = this->templ->getPage("page_deletion");

handlers/handlerpageedit.cpp

@@ -101,6 +101,7 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
 				pageDao.setCategories(pagename, cats);
 				this->database->commitTransaction();
 				this->cache->removePrefix("page:"); // TODO: overkill?
+				this->cache->removePrefix("feed:");
 			}
 			catch(const DatabaseException &e)
 			{

handlers/handlerpageview.cpp

@@ -24,6 +24,10 @@ SOFTWARE.
 #include "../parser.h"
 #include "../htmllink.h"
 #include "../dynamic/dynamiccontentpostlist.h"
+#include "../dynamic/dynamiccontentincludepage.h"
+#include "../dynamic/dynamiccontentsetvar.h"
+#include "../dynamic/dynamiccontentgetvar.h"
+
 bool HandlerPageView::canAccess(std::string page)
 {
 	return effectivePermissions(page).canRead();
@@ -136,21 +140,46 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 	std::string indexcontent;
 	std::string parsedcontent;
 
+	std::map<std::string, std::string> dynamicVarsMap;
 	std::function<std::string(std::string_view, std::string_view)> dynamicParseCallback =
 		[&](std::string_view key, std::string_view value) -> std::string
 	{
 		if(key == "dynamic:postlist")
 		{
 			std::shared_ptr<DynamicContentPostList> postlist = createDynamic<DynamicContentPostList>();
-			postlist->setCategory(std::string(value));
+			postlist->setArgument(std::string(value));
 			return postlist->render();
 		}
+		if(key == "dynamic:includepage")
+		{
+			if((effectivePermissions(std::string(value)).canRead()))
+			{
+				std::shared_ptr<DynamicContentIncludePage> includePage = createDynamic<DynamicContentIncludePage>();
+				includePage->setArgument(std::string(value));
+				return parser.parseDynamics(includePage->render(), dynamicParseCallback);
+			}
+		}
+		if(key == "dynamic:setvar")
+		{
+			std::shared_ptr<DynamicContentSetVar> setVar = createDynamic<DynamicContentSetVar>();
+			setVar->setMap(dynamicVarsMap);
+			setVar->setArgument(std::string(value));
+			return setVar->render();
+		}
+		if(key == "dynamic:getvar")
+		{
+			std::shared_ptr<DynamicContentGetVar> getVar = createDynamic<DynamicContentGetVar>();
+			getVar->setMap(dynamicVarsMap);
+			getVar->setArgument(std::string(value));
+			return getVar->render();
+		}
 		return std::string{};
 	};
+	std::string resolvedContent = parser.parseDynamics(revision->content, dynamicParseCallback);
 	if(revisionid > 0)
 	{
-		indexcontent = createIndexContent(parser, revision->content);
-		parsedcontent = parser.parse(pageDao, *this->urlProvider, revision->content, dynamicParseCallback);
+		indexcontent = createIndexContent(parser, resolvedContent);
+		parsedcontent = parser.parse(pageDao, *this->urlProvider, resolvedContent);
 	}
 	else
 	{
@@ -164,7 +193,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 		}
 		else
 		{
-			indexcontent = createIndexContent(parser, revision->content);
+			indexcontent = createIndexContent(parser, resolvedContent);
 			this->cache->put(cachekeyindexcontent, indexcontent);
 		}
 		if(cachedparsedcontent)
@@ -173,7 +202,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 		}
 		else
 		{
-			parsedcontent = parser.parse(pageDao, *this->urlProvider, revision->content, dynamicParseCallback);
+			parsedcontent = parser.parse(pageDao, *this->urlProvider, resolvedContent);
 			this->cache->put(cachekeyparsedcontent, parsedcontent);
 		}
 	}

iparser.h

@@ -23,6 +23,10 @@ class IParser
 	}
 	virtual std::string parse(const PageDao &pagedao, UrlProvider &provider, const std::string &content,
 							  const std::function<std::string(std::string_view, std::string_view)> &callback) const = 0;
+
+	virtual std::string parseDynamics(
+		const std::string &content,
+		const std::function<std::string(std::string_view, std::string_view)> &callback) const = 0;
 	virtual std::vector<std::string> extractCategories(const std::string &content) const = 0;
 
 	virtual ~IParser(){};

parser.cpp

@@ -30,7 +30,8 @@ SOFTWARE.
 std::vector<Headline> Parser::extractHeadlines(const std::string &content) const
 {
 	std::vector<Headline> result;
-	std::string reg = R"(\[h(1|2|3)\](.*?)\[/h\1\])";
+
+	std::string reg = R"(\[h(1|2|3)\](\[.*?\])*(.*?)\[.*?\]*\[\/h\1\])";
 	std::regex headerfinder(reg);
 	auto begin = std::sregex_iterator(content.begin(), content.end(), headerfinder);
 	auto end = std::sregex_iterator();
@@ -40,7 +41,7 @@ std::vector<Headline> Parser::extractHeadlines(const std::string &content) const
 		auto smatch = *it;
 		Headline h;
 		h.level = utils::toUInt(smatch.str(1));
-		h.title = smatch.str(2);
+		h.title = smatch.str(3);
 		result.push_back(h);
 	}
 	return result;
@@ -122,7 +123,7 @@ std::string Parser::parse(const PageDao &pagedao, UrlProvider &provider, const s
 	std::string result;
 	// we don't care about commands, but we nevertheless replace them with empty strings
 	std::regex tagfinder(
-		R"(\[(b|i|u|li||ul|ol|link|wikilink|h\d|cmd:rename|cmd:redirect|cmd:pagetitle|category|dynamic:postlist)*?\]((\s|\S)*?)\[/\1])");
+		R"(\[(b|i|u|li||ul|ol|link|wikilink|h\d|cmd:rename|cmd:redirect|cmd:pagetitle|category|dynamic:postlist|dynamic:includepage|dynamic:getvar|dynamic:setvar)*?\]((\s|\S)*?)\[/\1])");
 	result = utils::regex_callback_replacer(
 		tagfinder, content,
 		[&](std::smatch &match)
@@ -150,3 +151,11 @@ std::string Parser::parse(const PageDao &pagedao, UrlProvider &provider, const s
 	result = utils::strreplace(result, "\r\n", "<br>");
 	return result;
 }
+
+std::string Parser::parseDynamics(const std::string &content,
+								  const std::function<std::string(std::string_view, std::string_view)> &callback) const
+{
+	std::regex tagfinder(R"(\[(dynamic:\w+)*?\]((\s|\S)*?)\[/\1])");
+	return utils::regex_callback_replacer(tagfinder, content,
+										  [&](std::smatch &match) { return callback(match.str(1), match.str(2)); });
+}

parser.h

@@ -15,6 +15,9 @@ class Parser : public IParser
 	virtual std::string parse(
 		const PageDao &pagedao, UrlProvider &provider, const std::string &content,
 		const std::function<std::string(std::string_view, std::string_view)> &callback) const override;
+	std::string parseDynamics(
+		const std::string &content,
+		const std::function<std::string(std::string_view, std::string_view)> &callback) const override;
 
 	using IParser::IParser;
 };

template/quitesimple/feeds/atomentry

@@ -3,5 +3,6 @@
     <link href="{qswiki:var:entryurl}"/>
     <id>{qswiki:var:entryid}</id>
     <published>{qswiki:var:entrypublished}</published>
+    <updated>{qswiki:var:entryupdated}</updated>
     <content type="html">{qswiki:var:entrycontent}</content>
 </entry>

template/quitesimple/feeds/atomheader

@@ -5,4 +5,5 @@
   </author>
   <title>{qswiki:config:wikiname} - {qswiki:var:subtitle}</title>
   <id>{qswiki:var:atomfeeduniqueid}</id>
+  <link rel="self" href="{qswiki:var:atomselflink}"/>
   <updated>{qswiki:var:atomfeedupdate}</updated>

urlprovider.cpp

@@ -63,6 +63,11 @@ std::string UrlProvider::page(std::string pagename)
 	return replaceOnlyPage(config->linkpage, pagename);
 }
 
+std::string UrlProvider::pageByTitle(std::string title)
+{
+	return replaceSingleVar(config->linkpagebytitle, "title", utils::strreplace(title, " ", "-"));
+}
+
 std::string UrlProvider::linksHere(std::string pagename)
 {
 	return replaceOnlyPage(config->linkshere, pagename);

urlprovider.h

@@ -27,6 +27,8 @@ class UrlProvider
 
 	std::string page(std::string pagename);
 
+	std::string pageByTitle(std::string title);
+
 	std::string linksHere(std::string pagename);
 
 	std::string pageHistory(std::string pagename);