From 1ff0b71c43c2c286e3f81a33557d93d5bdd68886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Maldonado?= Date: Mon, 25 May 2020 12:14:13 +0200 Subject: [PATCH 1/2] [app.py] Remove ',' at the end of the lines, fix typo --- apps/blog/app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/blog/app.py b/apps/blog/app.py index 24101d4..cc823dc 100644 --- a/apps/blog/app.py +++ b/apps/blog/app.py @@ -26,9 +26,9 @@ from activitypub.database import * ## Pick one: database = RedisDatabase("redis://localhost:6379/0") #database = MongoDatabase("mongodb://localhost:27017", "dsblank_localhost:5000") -#database = ListDatabase(), -#database = SQLDatabase("sqlite://"), -#datavbase = SQLDatabase("sqlite:///sqlite.db"), +#database = ListDatabase() +#database = SQLDatabase("sqlite://") +#database = SQLDatabase("sqlite:///sqlite.db") """ ### Some fake data: From e3137e94041ea6acd676bcdc13225a675a9c14f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Maldonado?= Date: Mon, 25 May 2020 12:16:23 +0200 Subject: [PATCH 2/2] [app.py] Move 'manager' declaration before the code that adds fake data --- apps/blog/app.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/blog/app.py b/apps/blog/app.py index cc823dc..4401210 100644 --- a/apps/blog/app.py +++ b/apps/blog/app.py @@ -30,6 +30,20 @@ database = RedisDatabase("redis://localhost:6379/0") #database = SQLDatabase("sqlite://") #database = SQLDatabase("sqlite:///sqlite.db") +manager = Manager(database=database) +manager.setup_css() +## FIXME: get rid of all of these: +manager.config.update({ + "ME": { + "url": "https://example.com", + "icon": {"url": "https://example.com"}, + "icon_url": 'https://cs.brynmawr.edu/~dblank/images/doug-sm-orig.jpg', + "summary": "I'm just me."}, + "NAME": "ActivityPub Blog", + "ID": "http://localhost:%s/dsblank" % manager.port, + "BASE_URL": "http://localhost:%s" % manager.port, + }) + """ ### Some fake data: @@ -86,24 +100,10 @@ for i in range(10): 'remote_id': '$DOMAIN/outbox/%s' % note.temp_uuid, 'meta': {'undo': False, 'deleted': False}, }) - + database.activities.insert_one(message.to_dict()) """ -manager = Manager(database=database) -manager.setup_css() -## FIXME: get rid of all of these: -manager.config.update({ - "ME": { - "url": "https://example.com", - "icon": {"url": "https://example.com"}, - "icon_url": 'https://cs.brynmawr.edu/~dblank/images/doug-sm-orig.jpg', - "summary": "I'm just me."}, - "NAME": "ActivityPub Blog", - "ID": "http://localhost:%s/dsblank" % manager.port, - "BASE_URL": "http://localhost:%s" % manager.port, - }) - #### The routes: @app.route("/notes", endpoint="notes") @@ -241,7 +241,7 @@ def paginated_query(self, db, q, limit=5, sort_key="_id"): older_than = str(outbox_data[-1]["_id"]) return outbox_data, older_than, newer_than - + @app.context_processor def context_processor(self): q = {