Skip to content

Commit

Permalink
Merge pull request #715 from mozilla/revert-714-search-my-rooms
Browse files Browse the repository at this point in the history
Revert "Add a search query for owned rooms"
  • Loading branch information
keianhzo authored Mar 29, 2024
2 parents efea757 + 1d506c9 commit 105eb0c
Showing 1 changed file with 2 additions and 25 deletions.
27 changes: 2 additions & 25 deletions lib/ret/media_search.ex
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ defmodule Ret.MediaSearch do
@max_collection_face_count 200_000

# see sketchfab bug about max_filesizes params broken
# @max_file_size_bytes 20 * 1024 * 1024
# @max_file_size_bytes 20 * 1024 * 1024
# @max_collection_file_size_bytes 100 * 1024 * 1024

def search(%Ret.MediaSearchQuery{
Expand Down Expand Up @@ -125,10 +125,6 @@ defmodule Ret.MediaSearch do
public_rooms_search(cursor, q)
end

def search(%Ret.MediaSearchQuery{source: "rooms", filter: "created", cursor: cursor, q: q}) do
created_rooms_search(cursor, q)
end

def search(%Ret.MediaSearchQuery{
source: "sketchfab",
cursor: cursor,
Expand Down Expand Up @@ -229,7 +225,7 @@ defmodule Ret.MediaSearch do
downloadable: true,
count: @page_size,
max_face_count: @max_face_count,
# max_filesizes: "gltf:#{@max_file_size_bytes}",
# max_filesizes: "gltf:#{@max_file_size_bytes}",
processing_status: :succeeded,
cursor: cursor,
categories: filter,
Expand Down Expand Up @@ -551,25 +547,6 @@ defmodule Ret.MediaSearch do
{:commit, results}
end

defp created_rooms_search(cursor, _query) do
page_number = (cursor || "1") |> Integer.parse() |> elem(0)

ecto_query =
from h in Hub,
preload: [
scene: [:screenshot_owned_file],
scene_listing: [:scene, :screenshot_owned_file]
],
order_by: [desc: :inserted_at]

results =
ecto_query
|> Repo.paginate(%{page: page_number, page_size: @page_size})
|> result_for_page(page_number, :my_rooms, &hub_to_entry/1)

{:commit, results}
end

defp filter_by_hub_entry_mode(query, entry_mode) do
from fav in query,
join: hub in assoc(fav, :hub),
Expand Down

0 comments on commit 105eb0c

Please sign in to comment.