From: lain <lain@soykaf.club>
Date: Tue, 13 Mar 2018 17:32:17 +0000 (+0100)
Subject: Only push to still valid websub subscriptions.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0067c9d2be4474a414628461b1248051124408d0;p=akkoma

Only push to still valid websub subscriptions.
---

diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 47a01849d..fa3ab7214 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -49,7 +49,8 @@ defmodule Pleroma.Web.Websub do
   def publish(topic, user, %{data: %{"type" => type}} = activity) when type in @supported_activities do
     # TODO: Only send to still valid subscriptions.
     query = from sub in WebsubServerSubscription,
-    where: sub.topic == ^topic and sub.state == "active"
+      where: sub.topic == ^topic and sub.state == "active",
+      where: fragment("? > NOW()", sub.valid_until)
     subscriptions = Repo.all(query)
     Enum.each(subscriptions, fn(sub) ->
       response = user