Added nginx config

blasta.py

@@ -11,7 +11,6 @@ TODO
 
 """
 
-import argparse
 import asyncio
 from asyncio import Lock
 from datetime import datetime
@@ -52,7 +51,7 @@ DBLOCK = Lock()
 
 class Data:
 
-    def cache_items_and_tags_search(entries, jid, query):
+    def cache_items_and_tags(entries, jid, tag=None):
         """Create a cache file of node items and tags."""
         item_ids = []
         tags = {}
@@ -60,7 +59,13 @@ class Data:
             entry_tags = entry['tags']
             entry_url_hash = entry['url_hash']
             tags_to_include = []
-            if query in ' '.join([entry['title'], entry['link'], entry['summary'], ' '.join(entry_tags)]):
+            if tag:
+                if tag in entry_tags:
+                    item_ids.append(entry_url_hash)
+                    tags_to_include += entry_tags
+                    for tag_to_include in tags_to_include:
+                        tags[tag_to_include] = tags[tag_to_include]+1 if tag_to_include in tags else 1
+            else:
                 item_ids.append(entry_url_hash)
                 tags_to_include += entry_tags
                 for tag_to_include in tags_to_include:
@@ -68,60 +73,20 @@ class Data:
         if tags:
             tags = dict(sorted(tags.items(), key=lambda item: (-item[1], item[0])))
             tags = dict(list(tags.items())[:30])
-        if item_ids:
-            filename = 'data/{}_query.toml'.format(jid)
-            data = {
-                'item_ids' : item_ids,
-                'tags' : tags}
-            Data.save_to_toml(filename, data)
-
-    def cache_items_and_tags_filter(entries, jid, tag):
-        """Create a cache file of node items and tags."""
-        item_ids = []
-        tags = {}
-        for entry in entries:
-            entry_tags = entry['tags']
-            entry_url_hash = entry['url_hash']
-            tags_to_include = []
-            if tag in entry_tags:
-                item_ids.append(entry_url_hash)
-                tags_to_include += entry_tags
-                for tag_to_include in tags_to_include:
-                    tags[tag_to_include] = tags[tag_to_include]+1 if tag_to_include in tags else 1
-        if tags:
-            tags = dict(sorted(tags.items(), key=lambda item: (-item[1], item[0])))
-            tags = dict(list(tags.items())[:30])
-            del tags[tag]
+            if tag: del tags[tag]
         if item_ids:
             directory = 'data/{}/'.format(jid)
             if not exists(directory):
                 mkdir(directory)
-            filename = 'data/{}/{}.toml'.format(jid, tag)
+            if tag:
+                filename = 'data/{}/{}.toml'.format(jid, tag)
             # Add support for search query
-            #filename = 'data/{}/query:{}.toml'.format(jid, query)
-            #filename = 'data/{}/tag:{}.toml'.format(jid, tag)
-            data = {
-                'item_ids' : item_ids,
-                'tags' : tags}
-            Data.save_to_toml(filename, data)
-
-    def cache_items_and_tags(entries, jid):
-        """Create a cache file of node items and tags."""
-        item_ids = []
-        tags = {}
-        for entry in entries:
-            entry_tags = entry['tags']
-            entry_url_hash = entry['url_hash']
-            tags_to_include = []
-            item_ids.append(entry_url_hash)
-            tags_to_include += entry_tags
-            for tag_to_include in tags_to_include:
-                tags[tag_to_include] = tags[tag_to_include]+1 if tag_to_include in tags else 1
-        if tags:
-            tags = dict(sorted(tags.items(), key=lambda item: (-item[1], item[0])))
-            tags = dict(list(tags.items())[:30])
-        if item_ids:
-            filename = 'data/{}.toml'.format(jid)
+            #if tag:
+            #    filename = 'data/{}/query:{}.toml'.format(jid, query)
+            #if tag:
+            #    filename = 'data/{}/tag:{}.toml'.format(jid, tag)
+            else:
+                filename = 'data/{}.toml'.format(jid)
             data = {
                 'item_ids' : item_ids,
                 'tags' : tags}
@@ -225,9 +190,10 @@ class Data:
                     entries_cache_node = Data.extract_iq_items_extra(iq, jabber_id)
                     data_items = {node_type : entries_cache_node}
                     Data.save_to_toml(filename_items, data_items)
-                    return ['fine', iq] # TODO Remove this line
                 else:
-                    return ['error', iq]
+                    print('iq problem')
+                    breakpoint()
+                    print('iq problem')
             else:
                 entries_cache = Data.open_file_toml(filename_items)
                 if not node_type in entries_cache: return ['error', 'Directory "{}" is empty'. format(node_type)]
@@ -263,10 +229,10 @@ class Data:
                             entries_iq = Data.extract_iq_items_extra(iq, jabber_id)
                             entries_cache_node_new += entries_iq
                         else:
-                            # TODO
-                            # Handle this concern in a different fashion,
-                            # instead of stopping the whole operation.
-                            return ['error', iq]
+                            print('iq problem')
+                            breakpoint()
+                            print('iq problem')
+
                 entries_cache_node += entries_cache_node_new
 
                 if node_type == 'public':
@@ -431,14 +397,6 @@ class HttpInstance:
 #                                    httponly=False, # True
 #                                    samesite='lax')
 
-        @self.app.exception_handler(403)
-        def not_found_exception_handler(request: Request, exc: HTTPException):
-            jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
-            message = 'Blasta system message » Access denied.'
-            description = 'Access denied (403)'
-            path = 'error'
-            return result_post(request, jabber_id, description, message, path)
-
         @self.app.exception_handler(404)
         def not_found_exception_handler(request: Request, exc: HTTPException):
             jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
@@ -463,22 +421,6 @@ class HttpInstance:
             path = 'error'
             return result_post(request, jabber_id, description, message, path)
 
-        # TODO
-        @self.app.get('/admin')
-        def admin_get(request: Request):
-            jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
-            authorized = None
-            if authorized:
-                template_file = 'connect.xhtml'
-                template_dict = {
-                    'request' : request,
-                    'journal' : journal}
-                response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
-                return response
-            else:
-                raise HTTPException(status_code=403, detail='Access denied')
-
         @self.app.get('/connect')
         def connect_get(request: Request):
             jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
@@ -490,7 +432,7 @@ class HttpInstance:
                     'request' : request,
                     'journal' : journal}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/contact')
@@ -508,7 +450,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/disconnect')
@@ -536,7 +478,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about')
@@ -548,7 +490,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/folksonomy')
@@ -560,7 +502,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/ideas')
@@ -576,7 +518,7 @@ class HttpInstance:
                 'journal' : journal,
                 'origin' : origin}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/philosophy')
@@ -588,7 +530,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/projects')
@@ -600,7 +542,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/software')
@@ -612,7 +554,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/thanks')
@@ -624,7 +566,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/xmpp')
@@ -636,7 +578,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/xmpp/atomsub')
@@ -648,7 +590,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/xmpp/libervia')
@@ -660,7 +602,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/xmpp/movim')
@@ -672,7 +614,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/about/xmpp/pubsub')
@@ -688,7 +630,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/feeds')
@@ -700,7 +642,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/questions')
@@ -712,7 +654,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/syndication')
@@ -729,7 +671,7 @@ class HttpInstance:
                 'origin' : origin,
                 'pubsub_jid' : jabber_id_pubsub}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/help/utilities')
@@ -747,7 +689,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/jid', response_class=HTMLResponse)
@@ -820,48 +762,20 @@ class HttpInstance:
                 # NOTE Does it work?
                 #      It does not seem to actually filter tags.
                 # NOTE Yes. It does work.
-                #      See function "cache_items_and_tags_filter".
-                if param_query:
-                    query = param_query
-                    entries_cache = Data.open_file_toml(filename_items)
-                    entries_cache_node = entries_cache[node_type]
-                    filename_cache = 'data/{}_query.toml'.format(jid)
-                    Data.cache_items_and_tags_search(entries_cache_node, jid, query)
-                    if exists(filename_cache) and getsize(filename_cache):
-                        data = Data.open_file_toml(filename_cache)
-                        item_ids_all = data['item_ids']
-                        related_tags = data['tags']
-                        if len(item_ids_all) <= index_last:
-                            index_last = len(item_ids_all)
-                            page_next = None
-                        item_ids_selection = []
-                        for item_id in item_ids_all[index_first:index_last]:
-                            item_ids_selection.append(item_id)
-                        entries = []
-                        for entry in entries_cache_node:
-                            for item_id in item_ids_selection:
-                                if entry['url_hash'] == item_id:
-                                    entries.append(entry)
-                        for entry in entries:
-                            entry['published_mod'] = Utilities.convert_iso8601_to_readable(entry['published'])
-                            entry['tags'] = entry['tags'][:5]
-                        description = 'Your {} bookmarks with "{}"'.format(node_type, query)
-                        message = 'Listing {} bookmarks {} - {} out of {}.'.format(node_type, index_first+1, index_last, len(item_ids_all))
-                        #item_id_next = entries[len(entries)-1]
-                    else:
-                        description = 'No {} bookmarks with "{}" were found for {}'.format(node_type, query, jid)
-                        message = 'Blasta system message » No entries.'
-                        page_next = None
-                        page_prev = None
-                elif param_tags or param_tld or param_filetype or param_protocol:
+                #      See function "cache_items_and_tags".
+
+                # TODO Search by query
+                #if param_query:
+
+                if param_tags or param_tld or param_filetype or param_protocol:
                     tags_list = param_tags.split('+')
                     if len(tags_list) == 1:
                         tag = param_tags
                         entries_cache = Data.open_file_toml(filename_items)
                         entries_cache_node = entries_cache[node_type]
                         filename_cache = 'data/{}/{}.toml'.format(jid, tag)
-                        Data.cache_items_and_tags_filter(entries_cache_node, jid, tag)
-                        if exists(filename_cache) and getsize(filename_cache):
+                        Data.cache_items_and_tags(entries_cache_node, jid, tag)
+                        if exists(filename_cache) or getsize(filename_cache):
                             data = Data.open_file_toml(filename_cache)
                             item_ids_all = data['item_ids']
                             related_tags = data['tags']
@@ -897,7 +811,7 @@ class HttpInstance:
                     filename_cache = 'data/{}.toml'.format(jid)
                     #if len(entries_cache_node) and not exists(filename_cache):
                     Data.cache_items_and_tags(entries_cache_node, jid)
-                    if exists(filename_cache) and getsize(filename_cache):
+                    if exists(filename_cache) or getsize(filename_cache):
                         data = Data.open_file_toml(filename_cache)
                         item_ids_all = data['item_ids']
                         related_tags = data['tags']
@@ -950,11 +864,10 @@ class HttpInstance:
                     for tag, instances in SQLite.get_30_tags_by_jid(db_file, jid, index_first):
                         tags_dict[tag] = instances
                 if not entries_database:
-                    #message = 'Blasta system message » Error: No entries were found.'
-                    #description = 'No results'
-                    #path = 'error'
-                    #return result_post(request, jabber_id, description, message, path)
-                    raise HTTPException(status_code=404, detail='No entries were found')
+                    message = 'Blasta system message » Error: No entries were found.'
+                    description = 'No results'
+                    path = 'error'
+                    return result_post(request, jabber_id, description, message, path)
                 if entries_count:
                     entries = []
                     for entry in entries_database:
@@ -1015,7 +928,7 @@ class HttpInstance:
                         item_ids_selection = []
                         for item_id in item_ids_all[index_first:index_last]:
                             item_ids_selection.append(item_id)
-
+    
                         iq = await XmppPubsub.get_node_items(xmpp_instance, jid, node_id_public, item_ids_selection)
                         entries = Data.extract_iq_items_extra(iq, jid)
                         if entries:
@@ -1078,14 +991,13 @@ class HttpInstance:
                             'origin': origin,
                             'path': path}
                         response = templates.TemplateResponse(template_file, template_dict)
-                        response.headers['Content-Type'] = 'application/xhtml+xml'
+                        response.headers["Content-Type"] = "application/xhtml+xml"
                         return response
             else:
                 description = 'An XMPP account is required'
                 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)
-            if not entries: raise HTTPException(status_code=404, detail='No entries were found')
             template_dict = {
                 'request': request,
                 'description': description,
@@ -1113,7 +1025,7 @@ class HttpInstance:
             else:
                 template_file = 'browse.xhtml'
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/blasta.svg')
@@ -1206,11 +1118,10 @@ class HttpInstance:
                         tags_of_entries = SQLite.get_30_tags_by_entries_recent(db_file, index_first)
                         entries_count = SQLite.get_entries_count(db_file)
             if not entries_database:
-                #message = 'Blasta system message » Error: No entries were found.'
-                #description = 'No results'
-                #path = 'error'
-                #return result_post(request, jabber_id, description, message, path)
-                raise HTTPException(status_code=404, detail='No entries were found')
+                message = 'Blasta system message » Error: No entries were found.'
+                description = 'No results'
+                path = 'error'
+                return result_post(request, jabber_id, description, message, path)
             tags_dict = {}
             #for tag, instances in SQLite.get_tags_30(db_file):
             for tag, instances in tags_of_entries:
@@ -1285,7 +1196,7 @@ class HttpInstance:
             else:
                 template_file = 'browse.xhtml'
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         """
@@ -1387,21 +1298,19 @@ class HttpInstance:
                     path = 'error'
                     return result_post(request, jabber_id, description, message, path)
                 else:
-                    iq = await XmppPubsub.get_node_item(xmpp_instance, jabber_id, 'xmpp:blasta:configuration:0', 'routine')
-                    routine = None
+                    iq = await XmppPubsub.get_node_item(xmpp_instance, jabber_id, 'xmpp:blasta:settings:0', 'routine')
                     if isinstance(iq, slixmpp.stanza.iq.Iq):
                         payload = iq['pubsub']['items']['item']['payload']
-                        if payload:
-                            xmlns = '{jabber:x:data}'
-                            element_value = payload.find('.//' + xmlns + 'field[@var="routine"]/' + xmlns  + 'value')
-                            if isinstance(element_value, ET.Element): routine = element_value.text
+                        routine = payload.text if payload else None
+                    else:
+                        routine = None
                     match routine:
                         case 'private':
                             response = RedirectResponse(url='/private')
                         case 'read':
                             response = RedirectResponse(url='/read')
                         case _:
-                            response = RedirectResponse(url='/jid/')
+                            response = RedirectResponse(url='/jid/' + jabber_id)
 
             else:
                 #del accounts[jabber_id]
@@ -1440,7 +1349,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/private', response_class=HTMLResponse)
@@ -1472,7 +1381,7 @@ class HttpInstance:
             jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
             if jabber_id:
                 xmpp_instance = accounts[jabber_id]
-                if not await XmppPubsub.is_node_exist(xmpp_instance, 'xmpp:blasta:configuration:0'):
+                if not await XmppPubsub.is_node_exist(xmpp_instance, 'xmpp:blasta:settings:0'):
                     iq = XmppPubsub.create_node_config(xmpp_instance, jabber_id)
                     await iq.send(timeout=15)
                 access_models = {}
@@ -1483,13 +1392,10 @@ class HttpInstance:
                     access_models[node_type] = access_model
                 settings = {}
                 for setting in ['enrollment', 'routine']:
-                    iq = await XmppPubsub.get_node_item(xmpp_instance, jabber_id, 'xmpp:blasta:configuration:0', setting)
+                    iq = await XmppPubsub.get_node_item(xmpp_instance, jabber_id, 'xmpp:blasta:settings:0', setting)
                     if isinstance(iq, slixmpp.stanza.iq.Iq):
                         payload = iq['pubsub']['items']['item']['payload']
-                        if payload:
-                            xmlns = '{jabber:x:data}'
-                            element_value = payload.find('.//' + xmlns + 'field[@var="' + setting + '"]/' + xmlns  + 'value')
-                            if isinstance(element_value, ET.Element): settings[setting] = element_value.text
+                        if payload: settings[setting] = payload.text
                 template_file = 'profile.xhtml'
                 template_dict = {
                     'access_models' : access_models,
@@ -1499,7 +1405,7 @@ class HttpInstance:
                     'jabber_id' : jabber_id,
                     'journal' : journal}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             else:
                 message = 'Blasta system message » Error: No active session.'
                 description = 'You are not connected'
@@ -1516,15 +1422,15 @@ class HttpInstance:
                 xmpp_instance = accounts[jabber_id]
                 if routine:
                     message = 'The routine directory has been set to {}'.format(routine)
-                    payload = Xml.create_setting_entry(xmpp_instance, 'routine', routine)
-                    iq = await XmppPubsub.publish_node_item( # NOTE Consider "configurations" as item ID (see Movim)
-                        xmpp_instance, jabber_id, 'xmpp:blasta:configuration:0', 'routine', payload)
+                    payload = Xml.create_setting_entry(routine)
+                    iq = await XmppPubsub.publish_node_item(
+                        xmpp_instance, jabber_id, 'xmpp:blasta:settings:0', 'routine', payload)
                 if enroll:
                     if enroll == '1': message = 'Your database is shared with the Blasta system'
                     else: message = 'Your database is excluded from the Blasta system'
-                    payload = Xml.create_setting_entry(xmpp_instance, 'enroll', enroll)
+                    payload = Xml.create_setting_entry(enroll)
                     iq = await XmppPubsub.publish_node_item(
-                        xmpp_instance, jabber_id, 'xmpp:blasta:configuration:0', 'enrollment', payload)
+                        xmpp_instance, jabber_id, 'xmpp:blasta:settings:0', 'enrollment', payload)
                 description = 'Setting has been saved'
                 template_file = 'result.xhtml'
                 template_dict = {
@@ -1536,7 +1442,7 @@ class HttpInstance:
                     'request' : request,
                     'routine' : routine}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             else:
                 message = 'Blasta system message » Error: No active session.'
                 description = 'You are not connected'
@@ -1668,13 +1574,10 @@ class HttpInstance:
                     if (isinstance(iq, slixmpp.stanza.iq.Iq) and
                         url_hash == iq['pubsub']['items']['item']['id']):
                         return RedirectResponse(url='/url/' + url_hash + '/edit')
-                iq = await XmppPubsub.get_node_item(xmpp_instance, jabber_id, 'xmpp:blasta:configuration:0', 'routine')
+                iq = await XmppPubsub.get_node_item(xmpp_instance, jabber_id, 'xmpp:blasta:settings:0', 'routine')
                 if isinstance(iq, slixmpp.stanza.iq.Iq):
                     payload = iq['pubsub']['items']['item']['payload']
-                    if payload:
-                        xmlns = '{jabber:x:data}'
-                        element_value = payload.find('.//' + xmlns + 'field[@var="routine"]/' + xmlns  + 'value')
-                        if isinstance(element_value, ET.Element): routine = element_value.text
+                    routine = payload.text if payload else None
                 else:
                     routine = None
                 # NOTE Is "message" missing?
@@ -1703,7 +1606,7 @@ class HttpInstance:
                     'title' : param_title,
                     'url' : param_url}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             else:
                 message = 'Blasta system message » Error: No active session.'
                 description = 'You are not connected'
@@ -1748,7 +1651,7 @@ class HttpInstance:
                     'url' : url,
                     'url_hash' : url_hash}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
                 return response
             else:
                 message = 'Blasta system message » Error: No active session.'
@@ -1790,7 +1693,7 @@ class HttpInstance:
                 'path' : path,
                 'request' : request}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/register')
@@ -1802,7 +1705,7 @@ class HttpInstance:
                 'jabber_id' : jabber_id,
                 'journal' : journal}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/rss')
@@ -1841,7 +1744,7 @@ class HttpInstance:
                 'message' : message,
                 'path' : path}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/search/jid/{jid}')
@@ -1877,7 +1780,7 @@ class HttpInstance:
                     'message' : message,
                     'path' : path}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             else:
                 response = RedirectResponse(url='/search/all')
             return response
@@ -1909,7 +1812,7 @@ class HttpInstance:
                 'message' : message,
                 'path' : path}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/tag')
@@ -1928,7 +1831,7 @@ class HttpInstance:
                 'message' : message,
                 'tag_list' : tag_list}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/tag/{jid}')
@@ -1951,7 +1854,7 @@ class HttpInstance:
                 'message' : message,
                 'tag_list' : tag_list}
             response = templates.TemplateResponse(template_file, template_dict)
-            response.headers['Content-Type'] = 'application/xhtml+xml'
+            response.headers["Content-Type"] = "application/xhtml+xml"
             return response
 
         @self.app.get('/url')
@@ -2113,7 +2016,7 @@ class HttpInstance:
                     'syndicate' : syndicate,
                     'tags' : tags_list}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
             else:
                 message = 'Blasta system message » Error: MD5 message-digest algorithm.'
                 description = 'The argument for URL does not appear to be a valid MD5 Checksum'
@@ -2273,7 +2176,7 @@ class HttpInstance:
                     'syndicate': syndicate,
                     'tags' : tags_new}
                 response = templates.TemplateResponse(template_file, template_dict)
-                response.headers['Content-Type'] = 'application/xhtml+xml'
+                response.headers["Content-Type"] = "application/xhtml+xml"
                 return response
             else:
                 message = 'Blasta system message » Error: No active session.'
@@ -2339,7 +2242,7 @@ class HttpInstance:
                             'pubsub_jid' : jabber_id_pubsub,
                             'syndicate' : syndicate}
                         response = templates.TemplateResponse(template_file, template_dict)
-                        response.headers['Content-Type'] = 'application/xhtml+xml'
+                        response.headers["Content-Type"] = "application/xhtml+xml"
                     else:
                         response = RedirectResponse(url='/jid/' + jabber_id)
                 else:
@@ -2434,7 +2337,7 @@ class HttpInstance:
                             'restore' : True,
                             'syndicate' : syndicate}
                         response = templates.TemplateResponse(template_file, template_dict)
-                        response.headers['Content-Type'] = 'application/xhtml+xml'
+                        response.headers["Content-Type"] = "application/xhtml+xml"
                     else:
                         response = RedirectResponse(url='/jid/' + jabber_id)
                 else:
@@ -2536,7 +2439,7 @@ class HttpInstance:
                         'url' : entry['link'],
                         'url_hash' : url_hash}
                     response = templates.TemplateResponse(template_file, template_dict)
-                    response.headers['Content-Type'] = 'application/xhtml+xml'
+                    response.headers["Content-Type"] = "application/xhtml+xml"
                 else:
                     message = 'Blasta system message » Error: No active session.'
                     description = 'You are not connected'
@@ -4082,7 +3985,7 @@ class SQLite:
 #                    .format(function_name, db_file, tag))
         sql = (
             """
-            SELECT COUNT(DISTINCT entries.id)
+            SELECT COUNT(entries.id)
             FROM main_entries AS entries
             INNER JOIN combination_entries_tags_jids AS co ON entries.id = co.entry_id
             INNER JOIN main_tags AS tags ON tags.id = co.tag_id
@@ -5119,17 +5022,10 @@ class Utilities:
 
 class Xml:
 
-    def create_setting_entry(xmpp_instance, key : str, value : str):
-        form = xmpp_instance['xep_0004'].make_form('form', 'Settings')
-        form['type'] = 'result'
-        form.add_field(var=key,
-                       value=value)
-        return form
-
-#    def create_setting_entry(value : str):
-#        element = ET.Element('value')
-#        element.text = value
-#        return element
+    def create_setting_entry(value : str):
+        element = ET.Element('value')
+        element.text = value
+        return element
 
 class Configuration:
 
@@ -5237,7 +5133,7 @@ class XmppPubsub:
         iq = xmpp_instance.Iq(stype='set',
                               sto=jid,
                               sfrom=jid_from)
-        iq['pubsub']['create']['node'] = 'xmpp:blasta:configuration:0'
+        iq['pubsub']['create']['node'] = 'xmpp:blasta:settings:0'
         form = iq['pubsub']['configure']['form']
         form['type'] = 'submit'
         form.addField('pubsub#access_model',
@@ -5424,22 +5320,11 @@ def main():
     return http_instance.app
 
 app = main()
+webbrowser.open('http://localhost:8000/help/about')
+# TODO Check first time
+webbrowser.open_new_tab('http://localhost:8000')
 
 # FIXME
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        prog='blasta',
-        description='Blasta - A collaborative annotation system.',
-        usage='%(prog)s [OPTION]...')
-    parser.add_argument('-v', '--version', help='print version',
-                        action='version', version='0.1')
-    parser.add_argument('-p', '--port', help='port number', dest='port')
-    parser.add_argument('-o', '--open', help='open an html browser', action='store_const', const=True, dest='open')
-    args = parser.parse_args()
-    port = args.port if args.port else 8000
-    uvicorn.run(app, host='localhost', port=port, reload=True)
-    if args.open:
-        # TODO Check first time
-        webbrowser.open('http://localhost:{}/help/about'.format(port))
-        webbrowser.open_new_tab('http://localhost:{}'.format(port))
+    uvicorn.run(app, host='localhost', port=8000, reload=True)
 

blasta_client.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
 import webview
 import subprocess
 import sys
@@ -16,7 +13,7 @@ class HtmlView:
                 # Open the link using xdg-open
                 subprocess.run(['xdg-open', uri], check=True)
             except subprocess.CalledProcessError as e:
-                print('Failed to open URL: {}. Error: {}'.format(uri, e))
+                print(f"Failed to open URL: {uri}. Error: {e}")
         else:
             # If it is from url_instance, just load it in the webview
             #webview.load_url(uri)

proxy/nginx/blasta.conf

@@ -0,0 +1,30 @@
+map $http_upgrade $connection_upgrade {                                                                                                             default upgrade;                                                                                                                            ''      close;                                                                                                                      }                                                                                                                                           server {
+    server_name blasta.example.tld;
+
+    access_log /var/log/nginx/blasta/access.log;
+    error_log /var/log/nginx/blasta/error.log;
+
+    location / {
+            proxy_pass http://127.0.0.1:11112;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_read_timeout 3600;
+    }
+
+    listen [::]:443 ssl http2;
+    listen 443 ssl http2;
+    ssl_certificate /etc/letsencrypt/live/blasta.example.tld/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/blasta.example.tld/privkey.pem;
+}
+
+server {
+    listen [::]:80;
+    listen 80;
+    server_name blasta.example.tld;
+
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}

systemd/blasta.service

@@ -0,0 +1,16 @@
+# /etc/systemd/system/blasta.service
+[Unit]
+Description=Blasta Bookmarks Service
+After=network.target
+Requisite=network-online.target
+
+[Service]
+ExecStart=/usr/bin/uvicorn blasta:app --port 11112
+User=blasta
+Restart=always
+RestartSec=20s
+Type=simple
+WorkingDirectory=/home/blasta/Blasta
+
+[Install]
+WantedBy=multi-user.target

template/profile.xhtml

@@ -64,20 +64,14 @@
                      
                     PubSub bookmarks
                 </h2>
-                <p>
-                    » Information of your Jabber ID.
-                </p>
-                <h3>
-                    Your profile
-                </h3>
+                <p>» Information of your Jabber ID.</p>
+                <h3>Your Profile</h3>
                 <p>
                     This page provides a general survey of your XMPP account and
                     stored bookmarks.
                 </p>
                 <!--
-                <h4 id="enrollment">
-                    Enrollment
-                </h4>
+                <h4 id="enrollment">Enrollment</h4>
                 <p>
                     Blasta does not automatically include your public bookmarks
                     to its database.
@@ -126,9 +120,7 @@
                     therefore.
                 </p>
                 -->
-                <h4 id="export">
-                    Export
-                </h4>
+                <h4 id="export">Export</h4>
                 <p>
                     Export bookmarks to a file.
                 </p>
@@ -136,9 +128,7 @@
                     <!-- TODO Add XBEL, XHTML and XML -->
                     <dl>
                         <dt>
-                            <strong>
-                                Private
-                            </strong>
+                            <strong>Private</strong>
                         </dt>
                         <dd>
                             <a download="{{jabber_id}}_private.json"
@@ -149,9 +139,7 @@
                                 TOML</a>.
                         </dd>
                         <dt>
-                            <strong>
-                                Public
-                            </strong>
+                            <strong>Public</strong>
                         </dt>
                         <dd>
                             <a download="{{jabber_id}}_public.json"
@@ -162,9 +150,7 @@
                                 TOML</a>.
                         </dd>
                         <dt>
-                            <strong>
-                                Read
-                            </strong>
+                            <strong>Read</strong>
                         </dt>
                         <dd>
                             <a download="{{jabber_id}}_read.json"
@@ -176,9 +162,7 @@
                         </dd>
                     </dl>
                 </p>
-                <h4 id="import">
-                    Import
-                </h4>
+                <h4 id="import">Import</h4>
                 <p>
                     Import bookmarks from a file, and choose a node to import
                     your bookmarks to.
@@ -191,9 +175,7 @@
                         <tr>
                             <td>
                                 <strong>
-                                    <label for="file">
-                                        File
-                                    </label>
+                                    <label for="file">File</label>
                                 </strong>
                             </td>
                             <td>
@@ -207,9 +189,7 @@
                         <tr>
                             <td>
                                 <strong>
-                                    <label for="node">
-                                        Node
-                                    </label>
+                                    <label for="node">Node</label>
                                 </strong>
                             </td>
                             <td>
@@ -234,9 +214,7 @@
                         <tr>
                             <td>
                                 <strong>
-                                    <label for="node">
-                                        Action
-                                    </label>
+                                    <label for="node">Action</label>
                                 </strong>
                             </td>
                             <td>
@@ -444,9 +422,7 @@ retrieve items only if on a whitelist managed by the node owner.">
                     proceeding.
                 </p>
                 <hr/>
-                <h4 id="termination">
-                    Termination
-                </h4>
+                <h4 id="termination">Termination</h4>
                 <p>
                     Due to security concerns, Blasta does not have a built-in
                     mechanism to delete nodes.
@@ -462,9 +438,7 @@ retrieve items only if on a whitelist managed by the node owner.">
                     <a href="https://psi-im.org">Psi</a>, or
                     <a href="https://psi-plus.com">Psi+</a>.
                 </p>
-                <h4>
-                    Delete your public bookmarks
-                </h4>
+                <h4>Delete your public bookmarks</h4>
                 <pre>
     &lt;iq type='set'
         from='{{jabber_id}}'
@@ -475,9 +449,7 @@ retrieve items only if on a whitelist managed by the node owner.">
       &lt;/pubsub&gt;
     &lt;/iq&gt;
                 </pre>
-                <h4>
-                    Delete your private bookmarks
-                </h4>
+                <h4>Delete your private bookmarks</h4>
                 <pre>
     &lt;iq type='set'
         from='{{jabber_id}}'
@@ -488,9 +460,7 @@ retrieve items only if on a whitelist managed by the node owner.">
       &lt;/pubsub&gt;
     &lt;/iq&gt;
                 </pre>
-                <h4>
-                    Delete your reading list
-                </h4>
+                <h4>Delete your reading list</h4>
                 <pre>
     &lt;iq type='set'
         from='{{jabber_id}}'