](screenshot/browse.png)
+[
](screenshot/tag.png)
+
## Technicalities
Blasta is a federated bookmarking system which is based on XMPP and stores
@@ -45,7 +50,6 @@ The connection to the Blasta system is made with XMPP accounts.
## Future features
- ActivityPub;
-- Atom Syndication Format;
- Federation;
- Filters;
- Pin;
diff --git a/blasta.py b/blasta.py
index 012f700..710c9d0 100644
--- a/blasta.py
+++ b/blasta.py
@@ -261,15 +261,12 @@ class HttpInstance:
def __init__(self, accounts, sessions):
self.app = FastAPI()
- #templates = Jinja2Templates(directory='xhtml/template')
- templates = Jinja2Templates(directory='xhtml')
+ templates = Jinja2Templates(directory='template')
self.app.mount('/data', StaticFiles(directory='data'), name='data')
self.app.mount('/export', StaticFiles(directory='export'), name='export')
self.app.mount('/graphic', StaticFiles(directory='graphic'), name='graphic')
self.app.mount('/stylesheet', StaticFiles(directory='stylesheet'), name='stylesheet')
- #self.app.mount('/policy', StaticFiles(directory='xhtml/policy'), name='policy')
- #self.app.mount('/xhtml', StaticFiles(directory='xhtml'), name='xhtml')
filename_configuration = 'configuration.toml'
data = Data.open_file_toml(filename_configuration)
@@ -721,13 +718,14 @@ class HttpInstance:
related_tags = None
tags_dict = None
param_filetype = request.query_params.get('filetype', '') or None
+ param_mode = request.query_params.get('mode', '') or None
param_page = request.query_params.get('page', '') or None
param_protocol = request.query_params.get('protocol', '') or None
param_query = request.query_params.get('q', '') or None
if param_query: param_query = param_query.strip()
param_tags = request.query_params.get('tags', '') or None
param_tld = request.query_params.get('tld', '') or None
- if param_page:
+ if param_page and param_mode != 'feed':
try:
page = int(param_page)
page_next = page + 1
@@ -979,7 +977,6 @@ class HttpInstance:
message = 'Blasta system message ยป Please connect with your XMPP account to view this directory.'
path = 'error'
return result_post(request, jabber_id, description, message, path)
- template_file = 'browse.xhtml'
template_dict = {
'request': request,
'description': description,
@@ -999,8 +996,14 @@ class HttpInstance:
'start': start,
'syndicate': jid,
'tags' : tags_dict or related_tags or ''}
- response = templates.TemplateResponse(template_file, template_dict)
- response.headers["Content-Type"] = "application/xhtml+xml"
+ if param_mode == 'feed':
+ template_file = 'browse.atom'
+ response = templates.TemplateResponse(template_file, template_dict)
+ response.headers["Content-Type"] = "application/xml"
+ else:
+ template_file = 'browse.xhtml'
+ response = templates.TemplateResponse(template_file, template_dict)
+ response.headers["Content-Type"] = "application/xhtml+xml"
return response
@self.app.get('/blasta.svg')
@@ -1031,14 +1034,15 @@ class HttpInstance:
async def root_main_get(request: Request, response : Response, page_type=None):
jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
node_id = path = syndicate = page_type
+ param_filetype = request.query_params.get('filetype', '') or None
+ param_mode = request.query_params.get('mode', '') or None
+ param_page = request.query_params.get('page', '') or None
+ param_protocol = request.query_params.get('protocol', '') or None
param_query = request.query_params.get('q', '') or None
if param_query: param_query = param_query.strip()
- param_page = request.query_params.get('page', '') or None
param_tags = request.query_params.get('tags', '') or None
param_tld = request.query_params.get('tld', '') or None
- param_filetype = request.query_params.get('filetype', '') or None
- param_protocol = request.query_params.get('protocol', '') or None
- if param_page:
+ if param_page and param_mode != 'feed':
try:
page = int(param_page)
page_next = page + 1
@@ -1154,8 +1158,14 @@ class HttpInstance:
'pubsub_jid' : jabber_id_pubsub,
'syndicate' : syndicate,
'tags' : tags_dict}
- response = templates.TemplateResponse(template_file, template_dict)
- response.headers["Content-Type"] = "application/xhtml+xml"
+ if param_mode == 'feed':
+ template_file = 'browse.atom'
+ response = templates.TemplateResponse(template_file, template_dict)
+ response.headers["Content-Type"] = "application/xml"
+ else:
+ template_file = 'browse.xhtml'
+ response = templates.TemplateResponse(template_file, template_dict)
+ response.headers["Content-Type"] = "application/xhtml+xml"
return response
"""
diff --git a/graphic/blasta_syndicate.svg b/graphic/blasta_syndicate.svg
new file mode 100644
index 0000000..aa48a61
--- /dev/null
+++ b/graphic/blasta_syndicate.svg
@@ -0,0 +1,6 @@
+
diff --git a/screenshot/browse.png b/screenshot/browse.png
new file mode 100644
index 0000000..482cacd
Binary files /dev/null and b/screenshot/browse.png differ
diff --git a/screenshot/tag.png b/screenshot/tag.png
new file mode 100644
index 0000000..b480ff0
Binary files /dev/null and b/screenshot/tag.png differ
diff --git a/stylesheet/stylesheet.xsl b/stylesheet/stylesheet.xsl
new file mode 100644
index 0000000..2b04756
--- /dev/null
+++ b/stylesheet/stylesheet.xsl
@@ -0,0 +1,491 @@
+
+
+
+
+ + + No content + +
+This entry is empty
+Please check that the mother PubSub node is populated with content.
+ + + This is an automated Blasta Syndication Feed + +
+
+
+ 
+
+ XMPP
+
+ 
+
+ Syndication
+
+ + Congratulations! You have reached to the final + frontier that the XML technology has to offer + to-date, and as of yet! +
++ This is an automated Blasta Syndication Feed + which you can utilize to gracefully receive + autmatic Blasta updates. +
++ Click + here for a selection of software and pick + the ones that would fit to you best! +
+
+ filetype:atom
+ filetype:rss
+ filetype:xml
+ software:akregator
+ software:fraidycat
+ software:liferea
+ software:otter-browser
+ software:raven-reader
+ niche:syndication
+
+ 
+