Skip to content

Commit

Permalink
Merge pull request #102 from sgratzl/sgratzl/fix_hidden
Browse files Browse the repository at this point in the history
fix detect hidden file
  • Loading branch information
sgratzl committed Jun 15, 2024
2 parents d8e6a82 + ad9cbeb commit 55a9d86
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions slack_cleaner2/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ def _context(self) -> str:
return str(self.msg)

def _delete_impl(self):
return self._slack.call_rate_limited(lambda: self._slack.client.reactions_remove(name=self.name, channel=self.msg.channel.id, timestamp=self.msg.ts))
return self._slack.call_rate_limited(lambda: self._slack.client.reactions_remove(name=self.name, channel=self.msg.channel.id, timestamp=self.msg.json["ts"]))


class SlackFile:
Expand Down Expand Up @@ -686,7 +686,7 @@ def __init__(self, entry: JSONDict, slack: "SlackCleaner"):
:type slack: SlackCleaner
"""
self.id = entry["id"]
self.hidden_by_limit = "hidden_by_limit" in entry
self.hidden_by_limit = "hidden_by_limit" in entry or entry.get("mode", "") == "hidden_by_limit"
self.name = entry.get("name", "Unknown")
self.title = entry.get("title", "Unknown")
self.pinned_to = entry.get("pinned_to", False)
Expand All @@ -698,11 +698,13 @@ def __init__(self, entry: JSONDict, slack: "SlackCleaner"):
self._slack = slack

@cached_property
def user(self) -> SlackUser:
def user(self) -> Optional[SlackUser]:
"""
user created this file
"""
return self._slack.users.resolve_user(self.json["user"])
if "user" in self.json:
return self._slack.users.resolve_user(self.json["user"])
return None

@staticmethod
def list(
Expand Down

0 comments on commit 55a9d86

Please sign in to comment.