Merge pull request #133 from CaptainFact/staging

Release 1.0.1

apps/cf/lib/notifications/subscriptions_matcher.ex

@@ -28,7 +28,7 @@ defmodule CF.Notifications.SubscriptionsMatcher do
       )
       when not is_nil(reply_to_id) do
     Subscription
-    |> where([s], s.user_id != ^user_id)
+    |> where([s], s.user_id != ^user_id and s.is_subscribed == true)
     |> where(
       [s],
       (s.comment_id == ^reply_to_id and s.scope == ^:comment) or
@@ -41,7 +41,7 @@ defmodule CF.Notifications.SubscriptionsMatcher do
 
   def match_action(action = %{entity: :comment, type: :create, user_id: user_id}) do
     Subscription
-    |> where([s], s.user_id != ^user_id)
+    |> where([s], s.user_id != ^user_id and s.is_subscribed == true)
     |> where(
       [s],
       (s.statement_id == ^action.statement_id and s.scope == ^:statement) or
@@ -54,7 +54,7 @@ defmodule CF.Notifications.SubscriptionsMatcher do
   def match_action(action = %{entity: :statement, type: type, user_id: user_id})
       when type in [:update, :remove, :create] do
     Subscription
-    |> where([s], s.user_id != ^user_id)
+    |> where([s], s.user_id != ^user_id and s.is_subscribed == true)
     |> where(
       [s],
       (s.statement_id == ^action.statement_id and s.scope == ^:statement) or
@@ -66,7 +66,7 @@ defmodule CF.Notifications.SubscriptionsMatcher do
 
   def match_action(%{entity: :video, type: :update, video_id: video_id, user_id: user_id}) do
     Subscription
-    |> where([s], s.user_id != ^user_id)
+    |> where([s], s.user_id != ^user_id and s.is_subscribed == true)
     |> where([s], s.scope == ^:video)
     |> where([s], s.video_id == ^video_id)
     |> Repo.all()
@@ -76,7 +76,7 @@ defmodule CF.Notifications.SubscriptionsMatcher do
   def match_action(%{entity: :speaker, type: type, video_id: video_id, user_id: user_id})
       when type in [:add, :remove] do
     Subscription
-    |> where([s], s.user_id != ^user_id)
+    |> where([s], s.user_id != ^user_id and s.is_subscribed == true)
     |> where([s], s.scope == ^:video)
     |> where([s], s.video_id == ^video_id)
     |> Repo.all()

apps/cf/mix.exs

@@ -4,7 +4,7 @@ defmodule CF.Mixfile do
   def project do
     [
       app: :cf,
-      version: "1.0.0",
+      version: "1.0.1",
       build_path: "../../_build",
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       config_path: "../../config/config.exs",

apps/cf_atom_feed/mix.exs

@@ -4,7 +4,7 @@ defmodule CF.AtomFeed.Mixfile do
   def project do
     [
       app: :cf_atom_feed,
-      version: "1.0.0",
+      version: "1.0.1",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/cf_graphql/mix.exs

@@ -4,7 +4,7 @@ defmodule CF.Graphql.Mixfile do
   def project do
     [
       app: :cf_graphql,
-      version: "1.0.0",
+      version: "1.0.1",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/cf_jobs/mix.exs

@@ -4,7 +4,7 @@ defmodule CF.Jobs.Mixfile do
   def project do
     [
       app: :cf_jobs,
-      version: "1.0.0",
+      version: "1.0.1",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/cf_opengraph/mix.exs

@@ -4,7 +4,7 @@ defmodule CF.Opengraph.MixProject do
   def project do
     [
       app: :cf_opengraph,
-      version: "1.0.0",
+      version: "1.0.1",
       elixir: "~> 1.6",
       start_permanent: Mix.env() == :prod,
       deps: deps(),

apps/cf_rest_api/mix.exs

@@ -4,7 +4,7 @@ defmodule CF.RestApi.Mixfile do
   def project do
     [
       app: :cf_rest_api,
-      version: "1.0.0",
+      version: "1.0.1",
       build_path: "../../_build",
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       config_path: "../../config/config.exs",

apps/db/mix.exs

@@ -4,7 +4,7 @@ defmodule DB.Mixfile do
   def project do
     [
       app: :db,
-      version: "1.0.0",
+      version: "1.0.1",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",