diff options
| author | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
|---|---|---|
| committer | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
| commit | 7d2e6429c27c5ddc8ef3d2366c44329092e07f77 (patch) | |
| tree | 7cfd2035f69616a369b2f3762ce9cefe61c2bd22 /app/lib/activitypub/activity/remove.rb | |
| parent | f2ff167c1a8df9b2521d33fcca15b8d5c67c50b1 (diff) | |
| parent | e396fbfe3bf4d2a404e78e73cff1a609dd0a9bfb (diff) | |
Merge branch 'glitch' into thread-icon
Diffstat (limited to 'app/lib/activitypub/activity/remove.rb')
| -rw-r--r-- | app/lib/activitypub/activity/remove.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/remove.rb b/app/lib/activitypub/activity/remove.rb index 62a1e3196..f523ead9f 100644 --- a/app/lib/activitypub/activity/remove.rb +++ b/app/lib/activitypub/activity/remove.rb @@ -6,7 +6,7 @@ class ActivityPub::Activity::Remove < ActivityPub::Activity status = status_from_uri(object_uri) - return unless status.account_id == @account.id + return unless !status.nil? && status.account_id == @account.id pin = StatusPin.find_by(account: @account, status: status) pin&.destroy! |