From d0541e3741d39f2a5c72d53f248c1e9f84e4ed70 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 7 Feb 2020 16:13:29 +0100 Subject: [PATCH 1/7] Hide promoted events on overview only if we already have them through participations Signed-off-by: Thomas Citharel --- js/src/views/Home.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue index 7e64ffd10..df9e55bf7 100644 --- a/js/src/views/Home.vue +++ b/js/src/views/Home.vue @@ -37,10 +37,10 @@

{{ $t("Upcoming") }}

- +
- +

{{ $tc('You have one event today.', row[1].length, {count: row[1].length}) }} @@ -71,7 +71,7 @@

{{ $t("Last week") }}

- +

{{ $t('Featured events') }}

- +
event.organizerActor && event.organizerActor.id !== this.currentActor.id); + return this.events.filter(({ id }) => !this.currentUserParticipations.map(({ event: { id } }) => id).includes(id)); } geoLocalize() { From 87eec90337ccb5c36c6109586562c3a3a36dad7c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 7 Feb 2020 16:14:09 +0100 Subject: [PATCH 2/7] Add correct env to yarn run build command Signed-off-by: Thomas Citharel --- docs/administration/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/administration/index.md b/docs/administration/index.md index 165b4c49a..1496ab13e 100644 --- a/docs/administration/index.md +++ b/docs/administration/index.md @@ -73,7 +73,7 @@ yarn install Finally, we can build the front-end (this can take a few seconds) ```bash -yarn run build +NODE_ENV=production yarn run build ``` Let's go back to the main directory From 39017b63a9a8241aa8bd821c35129c8a4b0727ee Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 7 Feb 2020 16:25:30 +0100 Subject: [PATCH 3/7] Add canonical link to the original event Signed-off-by: Thomas Citharel --- lib/service/metadata/event.ex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/service/metadata/event.ex b/lib/service/metadata/event.ex index b8fd1c49b..51a8ca60c 100644 --- a/lib/service/metadata/event.ex +++ b/lib/service/metadata/event.ex @@ -14,7 +14,9 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Events.Event do Tag.tag(:meta, property: "og:title", content: event.title), Tag.tag(:meta, property: "og:url", content: event.url), Tag.tag(:meta, property: "og:description", content: event.description), - Tag.tag(:meta, property: "og:type", content: "website") + Tag.tag(:meta, property: "og:type", content: "website"), + # Tell Search Engines what's the origin + Tag.tag(:link, rel: "canonical", href: event.url) ] tags = From 94df5bd1be8ce0e2d392d3956cd3bb55fa2e5a3c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 7 Feb 2020 16:28:49 +0100 Subject: [PATCH 4/7] Don't access remote events from non-federated instances when not logged in Signed-off-by: Thomas Citharel --- lib/graphql/resolvers/event.ex | 24 ++++++++++++++++++++---- lib/mobilizon/config.ex | 8 ++++++++ lib/mobilizon/events/events.ex | 21 ++++++++++++++++++++- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/lib/graphql/resolvers/event.ex b/lib/graphql/resolvers/event.ex index 93e8af394..addfc1ffa 100644 --- a/lib/graphql/resolvers/event.ex +++ b/lib/graphql/resolvers/event.ex @@ -5,6 +5,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do alias Mobilizon.{Actors, Admin, Events} alias Mobilizon.Actors.Actor + alias Mobilizon.Config alias Mobilizon.Events.{Event, EventParticipantStats} alias Mobilizon.Users.User @@ -44,16 +45,31 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do {:error, "Event with UUID #{uuid} not found"} end - def find_event(parent, %{uuid: uuid} = args, resolution) do - case {:has_event, Events.get_public_event_by_uuid_with_preload(uuid)} do - {:has_event, %Event{} = event} -> - {:ok, Map.put(event, :organizer_actor, Person.proxify_pictures(event.organizer_actor))} + def find_event(parent, %{uuid: uuid} = args, %{context: context} = resolution) do + require Logger + Logger.error(inspect(context)) + with {:has_event, %Event{} = event} <- + {:has_event, Events.get_public_event_by_uuid_with_preload(uuid)}, + {:access_valid, true} <- + {:access_valid, Map.has_key?(context, :current_user) || check_event_access(event)} do + {:ok, Map.put(event, :organizer_actor, Person.proxify_pictures(event.organizer_actor))} + else {:has_event, _} -> find_private_event(parent, args, resolution) + + {:access_valid, _} -> + {:error, "Event with UUID #{uuid} not found"} end end + def check_event_access(%Event{local: true}), do: true + + def check_event_access(%Event{url: url}) do + relay_actor_id = Config.relay_actor_id() + Events.check_if_event_has_instance_follow(url, relay_actor_id) + end + @doc """ List participants for event (through an event request) """ diff --git a/lib/mobilizon/config.ex b/lib/mobilizon/config.ex index dd7caf911..5b3e69bb3 100644 --- a/lib/mobilizon/config.ex +++ b/lib/mobilizon/config.ex @@ -140,6 +140,7 @@ defmodule Mobilizon.Config do ] def anonymous_actor_id, do: get_cached_value(:anonymous_actor_id) + def relay_actor_id, do: get_cached_value(:relay_actor_id) @spec get(module | atom) :: any def get(key), do: get(key, nil) @@ -202,6 +203,13 @@ defmodule Mobilizon.Config do end end + @spec create_cache(atom()) :: integer() + defp create_cache(:relay_actor_id) do + with {:ok, %Actor{id: actor_id}} <- Actors.get_or_create_internal_actor("relay") do + actor_id + end + end + def clear_config_cache do Cachex.clear(:config) end diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex index 74b29557b..c22d3ea38 100644 --- a/lib/mobilizon/events/events.ex +++ b/lib/mobilizon/events/events.ex @@ -12,7 +12,7 @@ defmodule Mobilizon.Events do alias Ecto.{Changeset, Multi} - alias Mobilizon.Actors.Actor + alias Mobilizon.Actors.{Actor, Follower} alias Mobilizon.Addresses.Address alias Mobilizon.Events.{ @@ -28,6 +28,7 @@ defmodule Mobilizon.Events do } alias Mobilizon.Service.Workers + alias Mobilizon.Share alias Mobilizon.Storage.{Page, Repo} alias Mobilizon.Users.User @@ -228,6 +229,14 @@ defmodule Mobilizon.Events do |> Repo.one() end + @spec check_if_event_has_instance_follow(String.t(), integer()) :: boolean() + def check_if_event_has_instance_follow(event_uri, follower_actor_id) do + Share + |> join(:inner, [s], f in Follower, on: f.target_actor_id == s.actor_id) + |> where([s, f], f.actor_id == ^follower_actor_id and s.uri == ^event_uri) + |> Repo.exists?() + end + @doc """ Gets an event by its UUID, with all associations loaded. """ @@ -379,6 +388,7 @@ defmodule Mobilizon.Events do |> filter_future_events(is_future) |> filter_unlisted(is_unlisted) |> filter_draft() + |> filter_local_or_from_followed_instances_events() |> Repo.all() end @@ -461,6 +471,7 @@ defmodule Mobilizon.Events do name |> normalize_search_string() |> events_for_search_query() + |> filter_local_or_from_followed_instances_events() |> Page.build_page(page, limit) end @@ -1757,6 +1768,14 @@ defmodule Mobilizon.Events do defp filter_future_events(query, false), do: query + defp filter_local_or_from_followed_instances_events(query) do + from(q in query, + left_join: s in Share, + on: s.uri == q.url, + where: q.local == true or not is_nil(s.uri) + ) + end + @spec filter_unlisted(Ecto.Query.t(), boolean) :: Ecto.Query.t() defp filter_unlisted(query, true) do from(q in query, where: q.visibility in ^@public_visibility) From f4496ccc6d4c9c0855910efce6c7a5e429b10a4b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 7 Feb 2020 17:04:03 +0100 Subject: [PATCH 5/7] Fix search with URL fetching twice Signed-off-by: Thomas Citharel --- js/src/views/Search.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/js/src/views/Search.vue b/js/src/views/Search.vue index 98a2bdc44..9bc7eb05c 100644 --- a/js/src/views/Search.vue +++ b/js/src/views/Search.vue @@ -87,7 +87,7 @@ const tabsName = { }; }, skip() { - return !this.searchTerm; + return !this.searchTerm || this.isURL(this.searchTerm); }, }, }, @@ -104,6 +104,13 @@ export default class Search extends Vue { searchGroups: SearchGroup = { total: 0, elements: [] }; activeTab: SearchTabs = tabsName[this.searchType]; + @Watch('searchEvents') + async redirectURLToEvent() { + if (this.searchEvents.total === 1 && this.isURL(this.searchTerm)) { + return await this.$router.replace({ name: RouteName.EVENT, params: { uuid: this.searchEvents.elements[0].uuid } }); + } + } + changeTab(index: number) { switch (index) { case SearchTabs.EVENTS: @@ -136,6 +143,12 @@ export default class Search extends Vue { return this.searchGroups.elements.map(group => Object.assign(new Group(), group)); } + isURL(url: string): boolean { + const a = document.createElement('a'); + a.href = url; + return (a.host && a.host !== window.location.host) as boolean; + } + }