about summary refs log tree commit diff
path: root/app/lib/activitypub/activity.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-02-12 20:29:55 +0100
committerGitHub <noreply@github.com>2019-02-12 20:29:55 +0100
commita3ba28eb17d75af37396359e8c37675e06605ccf (patch)
tree20d81ffc7b01b132e1683685a0176ede6374c13c /app/lib/activitypub/activity.rb
parentb89e003c4d049d64d2d4015357b8b931370bc5f0 (diff)
parentb47a53f90299a1fb52423aacbc0c23427e2eb132 (diff)
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity.rb')
-rw-r--r--app/lib/activitypub/activity.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 87318fb1c..919678618 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -2,6 +2,7 @@
 
 class ActivityPub::Activity
   include JsonLdHelper
+  include Redisable
 
   def initialize(json, account, **options)
     @json    = json
@@ -70,10 +71,6 @@ class ActivityPub::Activity
     @object_uri ||= value_or_id(@object)
   end
 
-  def redis
-    Redis.current
-  end
-
   def distribute(status)
     crawl_links(status)