From 6ab59d2e41de315f6376897c7dfeb2cd3f740c66 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sat, 13 Jul 2019 00:28:14 +0200 Subject: [PATCH 1/9] Start working on post visibility --- app.py | 30 +++++++++++++++++++++++++----- templates/new.html | 5 +++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index 93c54ea..840c1c0 100644 --- a/app.py +++ b/app.py @@ -1532,6 +1532,7 @@ def admin_new(): reply=reply_id, content=content, thread=thread, + visibility=ap.Visibility, emojis=EMOJIS.split(" "), ) @@ -1995,22 +1996,41 @@ def api_new_note(): except ValueError: pass + visibility = ap.Visibility[ + _user_api_arg("visibility", default=ap.Visibility.PUBLIC.name) + ] + content, tags = parse_markdown(source) - to = request.args.get("to") - cc = [ID + "/followers"] + + to, cc = [], [] + if visibility == ap.Visibility.PUBLIC: + to = [ap.AS_PUBLIC] + cc = [ID + "/followers"] + elif visibility == ap.Visibility.UNLISTED: + to = [ID + "/followers"] + cc = [ap.AS_PUBLIC] + elif visibility == ap.Visibility.FOLLOWERS_ONLY: + to = [ID + "/followers"] + cc = [] if _reply: reply = ap.fetch_remote_activity(_reply) - cc.append(reply.attributedTo) + if visibility == ap.Visibility.DIRECT: + to.append(reply.attributedTo) + else: + cc.append(reply.attributedTo) for tag in tags: if tag["type"] == "Mention": - cc.append(tag["href"]) + if visibility == ap.Visibility.DIRECT: + to.append(tag["href"]) + else: + cc.append(tag["href"]) raw_note = dict( attributedTo=MY_PERSON.id, cc=list(set(cc)), - to=[to if to else ap.AS_PUBLIC], + to=list(set(to)), content=content, tag=tags, source={"mediaType": "text/markdown", "content": source}, diff --git a/templates/new.html b/templates/new.html index 9b27df6..0fa98fc 100644 --- a/templates/new.html +++ b/templates/new.html @@ -21,6 +21,11 @@
+ {% if reply %}{% endif %}

From 152bcf2b26d71f1cc6f7844575a60c374f538dbb Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sat, 13 Jul 2019 00:38:51 +0200 Subject: [PATCH 2/9] Only show public stuff on the homepage --- app.py | 11 ++++++----- tasks.py | 2 +- templates/header.html | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app.py b/app.py index 840c1c0..5468f59 100644 --- a/app.py +++ b/app.py @@ -86,8 +86,8 @@ from config import VERSION_DATE from config import _drop_db from poussetaches import PousseTaches from tasks import Tasks -from utils import parse_datetime from utils import opengraph +from utils import parse_datetime from utils.key import get_secret_key from utils.lookup import lookup from utils.media import Kind @@ -143,13 +143,13 @@ def inject_config(): notes_count = DB.activities.find( {"box": Box.OUTBOX.value, "$or": [q, {"type": "Announce", "meta.undo": False}]} ).count() + # FIXME(tsileo): rename to all_count, and remove poll answers from it with_replies_count = DB.activities.find( { "box": Box.OUTBOX.value, "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, "meta.undo": False, "meta.deleted": False, - "meta.public": True, } ).count() liked_count = DB.activities.count( @@ -875,6 +875,7 @@ def index(): "activity.object.inReplyTo": None, "meta.deleted": False, "meta.undo": False, + "meta.public": True, "$or": [{"meta.pinned": False}, {"meta.pinned": {"$exists": False}}], } print(list(DB.activities.find(q))) @@ -887,6 +888,7 @@ def index(): "type": ActivityType.CREATE.value, "meta.deleted": False, "meta.undo": False, + "meta.public": True, "meta.pinned": True, } pinned = list(DB.activities.find(q_pinned)) @@ -906,14 +908,13 @@ def index(): return resp -@app.route("/with_replies") +@app.route("/all") @login_required -def with_replies(): +def all(): q = { "box": Box.OUTBOX.value, "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, "meta.deleted": False, - "meta.public": True, "meta.undo": False, } outbox_data, older_than, newer_than = paginated_query(DB.activities, q) diff --git a/tasks.py b/tasks.py index 9855f64..9515fe0 100644 --- a/tasks.py +++ b/tasks.py @@ -2,8 +2,8 @@ import os from datetime import datetime from datetime import timezone -from utils import parse_datetime from poussetaches import PousseTaches +from utils import parse_datetime p = PousseTaches( os.getenv("MICROBLOGPUB_POUSSETACHES_HOST", "http://localhost:7991"), diff --git a/templates/header.html b/templates/header.html index 8fc7eb1..29c396d 100644 --- a/templates/header.html +++ b/templates/header.html @@ -18,7 +18,7 @@

  • Notes {{ notes_count }}
    • -{% if session.logged_in %}
  • With replies {{ with_replies_count }}
    • +{% if session.logged_in %}
  • All {{ with_replies_count }}
    • {% endif %}
  • Liked {{ liked_count }}
  • Followers {{ followers_count }}
    • From 243e28fa75a2f68e66a8840aab6daa878b551481 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sun, 14 Jul 2019 23:57:23 +0200 Subject: [PATCH 3/9] Lot of migration work (better normalization), and more visibility work --- activitypub.py | 43 +++++++++++++++--- app.py | 35 ++++++++++----- migrations.py | 101 ++++++++++++++++++++++++++++++++++++++++++ run.sh | 1 + sass/base_theme.scss | 9 ++++ templates/layout.html | 1 + templates/utils.html | 13 ++++-- utils/migrations.py | 56 +++++++++++++++++++++++ 8 files changed, 239 insertions(+), 20 deletions(-) create mode 100644 migrations.py create mode 100644 utils/migrations.py diff --git a/activitypub.py b/activitypub.py index 68d6545..82a259d 100644 --- a/activitypub.py +++ b/activitypub.py @@ -8,6 +8,7 @@ from typing import Any from typing import Dict from typing import List from typing import Optional +from urllib.parse import urlparse from bson.objectid import ObjectId from cachetools import LRUCache @@ -114,9 +115,17 @@ class MicroblogPubBackend(Backend): def save(self, box: Box, activity: ap.BaseActivity) -> None: """Custom helper for saving an activity to the DB.""" - is_public = True - if activity.has_type(ap.ActivityType.CREATE) and not activity.is_public(): - is_public = False + visibility = ap.get_visibility(activity) + is_public = False + if visibility in [ap.Visibility.PUBLIC, ap.Visibility.UNLISTED]: + is_public = True + object_id = None + try: + object_id = activity.get_object_id() + except ValueError: + pass + + actor_id = activity.get_actor().id DB.activities.insert_one( { @@ -124,7 +133,16 @@ class MicroblogPubBackend(Backend): "activity": activity.to_dict(), "type": _to_list(activity.type), "remote_id": activity.id, - "meta": {"undo": False, "deleted": False, "public": is_public}, + "meta": { + "undo": False, + "deleted": False, + "public": is_public, + "server": urlparse(activity.id).netloc, + "visibility": visibility.name, + "actor_id": actor_id, + "object_id": object_id, + "poll_answer": False, + }, } ) @@ -481,6 +499,15 @@ class MicroblogPubBackend(Backend): @ensure_it_is_me def outbox_create(self, as_actor: ap.Person, create: ap.Create) -> None: + obj = create.get_object() + + # Flag the activity as a poll answer if needed + print(f"POLL ANSWER ChECK {obj.get_in_reply_to()} {obj.name} {obj.content}") + if obj.get_in_reply_to() and obj.name and not obj.content: + DB.activities.update_one( + {"remote_id": create.id}, {"$set": {"meta.poll_answer": True}} + ) + self._handle_replies(as_actor, create) @ensure_it_is_me @@ -540,7 +567,13 @@ class MicroblogPubBackend(Backend): DB.activities.update_one( {"remote_id": create.id}, - {"$set": {"meta.answer_to": question.id, "meta.stream": False}}, + { + "$set": { + "meta.answer_to": question.id, + "meta.stream": False, + "meta.poll_answer": True, + } + }, ) return None diff --git a/app.py b/app.py index 5468f59..60ea41a 100644 --- a/app.py +++ b/app.py @@ -144,14 +144,13 @@ def inject_config(): {"box": Box.OUTBOX.value, "$or": [q, {"type": "Announce", "meta.undo": False}]} ).count() # FIXME(tsileo): rename to all_count, and remove poll answers from it - with_replies_count = DB.activities.find( - { - "box": Box.OUTBOX.value, - "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, - "meta.undo": False, - "meta.deleted": False, - } - ).count() + all_q = { + "box": Box.OUTBOX.value, + "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, + "meta.undo": False, + "meta.deleted": False, + "meta.poll_answer": False, + } liked_count = DB.activities.count( { "box": Box.OUTBOX.value, @@ -181,7 +180,7 @@ def inject_config(): following_count=DB.activities.count(following_q) if logged_in else 0, notes_count=notes_count, liked_count=liked_count, - with_replies_count=with_replies_count if logged_in else 0, + with_replies_count=DB.activities.count(all_q) if logged_in else 0, me=ME, base_url=config.BASE_URL, ) @@ -916,6 +915,7 @@ def all(): "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, "meta.deleted": False, "meta.undo": False, + "meta.poll_answer": False, } outbox_data, older_than, newer_than = paginated_query(DB.activities, q) @@ -1218,7 +1218,7 @@ def outbox(): if request.method == "GET": if not is_api_request(): abort(404) - # TODO(tsileo): returns the whole outbox if authenticated + # TODO(tsileo): returns the whole outbox if authenticated and look at OCAP support q = { "box": Box.OUTBOX.value, "meta.deleted": False, @@ -1253,7 +1253,11 @@ def outbox(): @app.route("/outbox/") def outbox_detail(item_id): doc = DB.activities.find_one( - {"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)} + { + "box": Box.OUTBOX.value, + "remote_id": back.activity_url(item_id), + "meta.public": True, + } ) if not doc: abort(404) @@ -1269,7 +1273,11 @@ def outbox_detail(item_id): @app.route("/outbox//activity") def outbox_activity(item_id): data = DB.activities.find_one( - {"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)} + { + "box": Box.OUTBOX.value, + "remote_id": back.activity_url(item_id), + "meta.public": True, + } ) if not data: abort(404) @@ -1295,6 +1303,7 @@ def outbox_activity_replies(item_id): "box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id), "meta.deleted": False, + "meta.public": True, } ) if not data: @@ -1305,6 +1314,7 @@ def outbox_activity_replies(item_id): q = { "meta.deleted": False, + "meta.public": True, "type": ActivityType.CREATE.value, "activity.object.inReplyTo": obj.get_object().id, } @@ -1330,6 +1340,7 @@ def outbox_activity_likes(item_id): "box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id), "meta.deleted": False, + "meta.public": True, } ) if not data: diff --git a/migrations.py b/migrations.py new file mode 100644 index 0000000..1ec997f --- /dev/null +++ b/migrations.py @@ -0,0 +1,101 @@ +"""Migrations that will be run automatically at startup.""" +from typing import Any +from typing import Dict +from urllib.parse import urlparse + +from little_boxes import activitypub as ap + +from utils.migrations import DB +from utils.migrations import Migration +from utils.migrations import logger +from utils.migrations import perform # noqa: just here for export + + +class _1_MetaMigrationt(Migration): + """Add new metadata to simplify querying.""" + + def __guess_visibility(self, data: Dict[str, Any]) -> ap.Visibility: + to = data.get("to", []) + cc = data.get("cc", []) + if ap.AS_PUBLIC in to: + return ap.Visibility.PUBLIC + elif ap.AS_PUBLIC in cc: + return ap.Visibility.UNLISTED + else: + # Uses a bit of heuristic here, it's too expensive to fetch the actor, so assume the followers + # collection has "/collection" in it (which is true for most software), and at worst, we will + # classify it as "DIRECT" which behave the same as "FOLLOWERS_ONLY" (i.e. no Announce) + followers_only = False + for item in to: + if "/followers" in item: + followers_only = True + break + if not followers_only: + for item in cc: + if "/followers" in item: + followers_only = True + break + if followers_only: + return ap.Visibility.FOLLOWERS_ONLY + + return ap.Visibility.DIRECT + + def migrate(self) -> None: # noqa: C901 # too complex + for data in DB.activities.find(): + logger.info(f"before={data}") + obj = data["activity"].get("object") + set_meta: Dict[str, Any] = {} + + # Set `meta.object_id` (str) + if not data["meta"].get("object_id"): + set_meta["meta.object_id"] = None + if obj: + if isinstance(obj, str): + set_meta["meta.object_id"] = data["activity"]["object"] + elif isinstance(obj, dict): + obj_id = obj.get("id") + if obj_id: + set_meta["meta.object_id"] = obj_id + + # Set `meta.object_visibility` (str) + if not data["meta"].get("object_visibility"): + set_meta["meta.object_visibility"] = None + object_id = data["meta"].get("object_id") or set_meta.get("meta.object_id") + if object_id: + obj = data["meta"].get("object") or data["activity"].get("object") + if isinstance(obj, dict): + set_meta["meta.object_visibility"] = self.__guess_visibility(obj).name + + # Set `meta.actor_id` (str) + if not data["meta"].get("actor_id"): + set_meta["meta.actor_id"] = None + actor = data["activity"].get("actor") + if actor: + if isinstance(actor, str): + set_meta["meta.actor_id"] = data["activity"]["actor"] + elif isinstance(actor, dict): + actor_id = actor.get("id") + if actor_id: + set_meta["meta.actor_id"] = actor_id + + # Set `meta.poll_answer` (bool) + if not data["meta"].get("poll_answer"): + set_meta["meta.poll_answer"] = False + if obj: + if isinstance(obj, dict): + if ( + obj.get("name") + and not obj.get("content") + and obj.get("inReplyTo") + ): + set_meta["meta.poll_answer"] = True + + # Set `meta.visibility` (str) + if not data["meta"].get("visibility"): + set_meta["meta.visibility"] = self.__guess_visibility(data["activity"]).name + + if not data["meta"].get("server"): + set_meta["meta.server"] = urlparse(data["remote_id"]).netloc + + logger.info(f"meta={set_meta}\n") + DB.activities.update_one({"_id": data["_id"]}, {"$set": set_meta}) diff --git a/run.sh b/run.sh index 8c9465c..313d405 100755 --- a/run.sh +++ b/run.sh @@ -1,3 +1,4 @@ #!/bin/bash +python -c "import logging; logging.basicConfig(level=logging.DEBUG); import migrations; migrations.perform()" python -c "import config; config.create_indexes()" gunicorn -t 600 -w 5 -b 0.0.0.0:5005 --log-level debug app:app diff --git a/sass/base_theme.scss b/sass/base_theme.scss index c4c67b2..116f259 100644 --- a/sass/base_theme.scss +++ b/sass/base_theme.scss @@ -270,6 +270,15 @@ a:hover { float: left; border-radius:2px; } +.bar-icon { + background: $background-color; + padding: 5px; + color: $color-light; + margin-right: 10px; + float: left; + border: none; +} + .bar-item:hover { background: $primary-color; color: $background-color; diff --git a/templates/layout.html b/templates/layout.html index 08a7761..e97787d 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -6,6 +6,7 @@ {% block title %}{{ config.NAME }}{% endblock %}'s microblog + {% if not request.args.get("older_than") and not request.args.get("previous_than") %}{% endif %} diff --git a/templates/utils.html b/templates/utils.html index a63895e..3a1fa6c 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -56,6 +56,7 @@ {% if not perma %} + @@ -164,10 +165,14 @@ {% if perma %} {{ obj.published | format_time }} {% if not (obj.id | is_from_outbox) %} -permalink + + + {% endif %} {% else %} -permalink + + + {% endif %} {% if meta.count_reply and obj.id | is_from_outbox %}{{ meta.count_reply }} replies @@ -192,7 +197,9 @@ - + {% endif %} diff --git a/utils/migrations.py b/utils/migrations.py new file mode 100644 index 0000000..cbf6eb2 --- /dev/null +++ b/utils/migrations.py @@ -0,0 +1,56 @@ +"""Automatic migration tools for the da:ta stored in MongoDB.""" +import logging +from abc import ABC +from abc import abstractmethod +from typing import List +from typing import Type + +from config import DB + +logger = logging.getLogger(__name__) + +# Used to keep track of all the defined migrations +_MIGRATIONS: List[Type["Migration"]] = [] + + +def perform() -> None: + """Perform all the defined migration.""" + for migration in _MIGRATIONS: + migration().perform() + + +class Migration(ABC): + """Abstract class for migrations.""" + + def __init__(self) -> None: + self.name = self.__class__.__qualname__ + self._col = DB.migrations + + def __init_subclass__(cls, **kwargs): + super().__init_subclass__(**kwargs) + _MIGRATIONS.append(cls) + + def _apply(self) -> None: + self._col.insert_one({"name": self.name}) + + def _reset(self) -> None: + self._col.delete_one({"name": self.name}) + + def _is_applied(self) -> bool: + return bool(self._col.find_one({"name": self.name})) + + @abstractmethod + def migrate(self) -> None: + """Expected to be implemented by actual migrations.""" + pass + + def perform(self) -> None: + if self._is_applied(): + logger.info(f"Skipping migration {self.name} (already applied)") + return + + logger.info(f"Performing migration {self.name}...") + self.migrate() + + self._apply() + logger.info("Done") From 866979309c7021f182d97fafd6d3501f6ba00171 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sun, 14 Jul 2019 23:58:10 +0200 Subject: [PATCH 4/9] Formatting --- migrations.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/migrations.py b/migrations.py index 1ec997f..e9ef95a 100644 --- a/migrations.py +++ b/migrations.py @@ -60,11 +60,15 @@ class _1_MetaMigrationt(Migration): # Set `meta.object_visibility` (str) if not data["meta"].get("object_visibility"): set_meta["meta.object_visibility"] = None - object_id = data["meta"].get("object_id") or set_meta.get("meta.object_id") + object_id = data["meta"].get("object_id") or set_meta.get( + "meta.object_id" + ) if object_id: obj = data["meta"].get("object") or data["activity"].get("object") if isinstance(obj, dict): - set_meta["meta.object_visibility"] = self.__guess_visibility(obj).name + set_meta["meta.object_visibility"] = self.__guess_visibility( + obj + ).name # Set `meta.actor_id` (str) if not data["meta"].get("actor_id"): @@ -92,7 +96,9 @@ class _1_MetaMigrationt(Migration): # Set `meta.visibility` (str) if not data["meta"].get("visibility"): - set_meta["meta.visibility"] = self.__guess_visibility(data["activity"]).name + set_meta["meta.visibility"] = self.__guess_visibility( + data["activity"] + ).name if not data["meta"].get("server"): set_meta["meta.server"] = urlparse(data["remote_id"]).netloc From 8e977a2b149928e3fa01ced6ad7c388464df6c2a Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Mon, 15 Jul 2019 23:08:12 +0200 Subject: [PATCH 5/9] More work on post visibility --- activitypub.py | 8 ++++++-- app.py | 17 +++++++++++++++++ migrations.py | 3 ++- sass/base_theme.scss | 19 ++++++++++--------- templates/index.html | 2 +- templates/layout.html | 2 +- templates/liked.html | 2 +- templates/stream.html | 6 +++--- templates/utils.html | 38 ++++++++++++++++++-------------------- 9 files changed, 59 insertions(+), 38 deletions(-) diff --git a/activitypub.py b/activitypub.py index 82a259d..b49b12a 100644 --- a/activitypub.py +++ b/activitypub.py @@ -124,6 +124,9 @@ class MicroblogPubBackend(Backend): object_id = activity.get_object_id() except ValueError: pass + object_visibility = None + if object_id: + object_visibility = ap.get_visibility(activity.get_object()) actor_id = activity.get_actor().id @@ -141,6 +144,7 @@ class MicroblogPubBackend(Backend): "visibility": visibility.name, "actor_id": actor_id, "object_id": object_id, + "object_visibility": object_visibility.name, "poll_answer": False, }, } @@ -670,7 +674,7 @@ def gen_feed(): fg.logo(ME.get("icon", {}).get("url")) fg.language("en") for item in DB.activities.find( - {"box": Box.OUTBOX.value, "type": "Create", "meta.deleted": False}, limit=10 + {"box": Box.OUTBOX.value, "type": "Create", "meta.deleted": False, "meta.public": True}, limit=10 ).sort("_id", -1): fe = fg.add_entry() fe.id(item["activity"]["object"].get("url")) @@ -684,7 +688,7 @@ def json_feed(path: str) -> Dict[str, Any]: """JSON Feed (https://jsonfeed.org/) document.""" data = [] for item in DB.activities.find( - {"box": Box.OUTBOX.value, "type": "Create", "meta.deleted": False}, limit=10 + {"box": Box.OUTBOX.value, "type": "Create", "meta.deleted": False, "meta.public": True}, limit=10 ).sort("_id", -1): data.append( { diff --git a/app.py b/app.py index 60ea41a..1116054 100644 --- a/app.py +++ b/app.py @@ -247,6 +247,16 @@ def _get_file_url(url, size, kind): return url +@app.template_filter() +def visibility(v: str) -> str: + return ap.Visibility[v].value.lower() + + +@app.template_filter() +def visibility_is_public(v: str) -> bool: + return v in [ap.Visibility.PUBLIC.name, ap.Visibility.UNLISTED.name] + + @app.template_filter() def emojify(text): return emoji_unicode.replace( @@ -1691,6 +1701,10 @@ def api_delete(): def api_boost(): note = _user_api_get_note() + # Ensures the note visibility allow us to build an Announce (in respect to the post visibility) + if ap.get_visibility(note) not in [ap.Visibility.PUBLIC, ap.VISIBILITY.UNLISTED]: + abort(400) + announce = note.build_announce(MY_PERSON) announce_id = post_to_outbox(announce) @@ -1841,6 +1855,7 @@ def admin_bookmarks(): @app.route("/inbox", methods=["GET", "POST"]) # noqa: C901 def inbox(): + # GET /inbox if request.method == "GET": if not is_api_request(): abort(404) @@ -1859,6 +1874,7 @@ def inbox(): ) ) + # POST/ inbox try: data = request.get_json(force=True) except Exception: @@ -3125,6 +3141,7 @@ def task_fetch_remote_question(): } ) remote_question = get_backend().fetch_iri(iri, no_cache=True) + # FIXME(tsileo): compute and set `meta.object_visiblity` (also update utils.py to do it) if ( local_question and ( diff --git a/migrations.py b/migrations.py index e9ef95a..4ce230c 100644 --- a/migrations.py +++ b/migrations.py @@ -104,4 +104,5 @@ class _1_MetaMigrationt(Migration): set_meta["meta.server"] = urlparse(data["remote_id"]).netloc logger.info(f"meta={set_meta}\n") - DB.activities.update_one({"_id": data["_id"]}, {"$set": set_meta}) + if set_meta: + DB.activities.update_one({"_id": data["_id"]}, {"$set": set_meta}) diff --git a/sass/base_theme.scss b/sass/base_theme.scss index 116f259..8b77b56 100644 --- a/sass/base_theme.scss +++ b/sass/base_theme.scss @@ -270,19 +270,20 @@ a:hover { float: left; border-radius:2px; } -.bar-icon { - background: $background-color; - padding: 5px; - color: $color-light; - margin-right: 10px; - float: left; - border: none; -} - .bar-item:hover { background: $primary-color; color: $background-color; } +.bar-item-no-border { + color: $color-light; + background: inherit; + cursor: default; +} +.bar-item-no-border:hover { + color: $color-light; + background: inherit; + cursor: default; +} button.bar-item { border: 0 } diff --git a/templates/index.html b/templates/index.html index f1c9711..527918d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -53,7 +53,7 @@ {% endif %} {% endif %} {% if item.meta.object %} - {{ utils.display_note(item.meta.object, ui=False, meta={'actor': item.meta.object_actor}) }} + {{ utils.display_note(item.meta.object, ui=False, meta=item.meta) }} {% endif %} {% elif item | has_type('Create') %} {{ utils.display_note(item.activity.object, meta=item.meta, no_color=True) }} diff --git a/templates/layout.html b/templates/layout.html index e97787d..65ff664 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -6,13 +6,13 @@ {% block title %}{{ config.NAME }}{% endblock %}'s microblog - {% if not request.args.get("older_than") and not request.args.get("previous_than") %}{% endif %} {% block links %}{% endblock %} {% if config.THEME_COLOR %}{% endif %}