From 3f4eebf85bff962294ebfc294c60717454cca977 Mon Sep 17 00:00:00 2001 From: jesopo Date: Tue, 15 Oct 2019 15:24:57 +0100 Subject: show ,fedi latest-tweet also if it's a self-reply --- modules/fediverse/__init__.py | 4 ++-- modules/fediverse/ap_actor.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/fediverse/__init__.py b/modules/fediverse/__init__.py index 575f0f6a..44b1357a 100644 --- a/modules/fediverse/__init__.py +++ b/modules/fediverse/__init__.py @@ -110,9 +110,9 @@ class Module(ModuleManager.BaseModule): raise utils.EventError("Failed to find user") items = actor.outbox.load() + nonreply = [actor.followers] for item in items: - if (item["type"] == "Announce" or - item["object"].get("inReplyTo", None) == None): + if item["type"] == "Announce" or item["object"]["cc"] == nonreply: first_item = item break diff --git a/modules/fediverse/ap_actor.py b/modules/fediverse/ap_actor.py index ace35acf..a2557e9b 100644 --- a/modules/fediverse/ap_actor.py +++ b/modules/fediverse/ap_actor.py @@ -9,6 +9,7 @@ class Actor(object): self.username = None self.inbox = None self.outbox = None + self.followers = None def load(self): response = ap_utils.activity_request(self.url) @@ -16,6 +17,7 @@ class Actor(object): self.username = response.data["preferredUsername"] self.inbox = Inbox(response.data["inbox"]) self.outbox = Outbox(response.data["outbox"]) + self.followers = response.data["followers"] return True return False -- cgit v1.3.1-10-gc9f91