add some tests for new qlc functions

Kraigie · May 22, 2024 · 8bb06d6 · 8bb06d6
1 parent c305e39
commit 8bb06d6
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 44 deletions.
diff --git a/lib/nostrum/cache/message_cache.ex b/lib/nostrum/cache/message_cache.ex
@@ -149,17 +149,22 @@ defmodule Nostrum.Cache.MessageCache do
   @spec get_by_channel(Channel.id(), timestamp_like(), timestamp_like() | :infinity) :: [
           Message.t()
         ]
-  def get_by_channel(channel_id, after_timestamp \\ 0, before_timestamp \\ :infinity) do
+  def get_by_channel(
+        channel_id,
+        after_timestamp \\ 0,
+        before_timestamp \\ :infinity,
+        cache \\ @configured_cache
+      ) do
     after_timestamp = timestamp_like_to_snowflake(after_timestamp)
     before_timestamp = timestamp_like_to_snowflake(before_timestamp)
 
     unsorted_result =
-      wrap_qlc(fn ->
+      wrap_qlc(cache, fn ->
         :nostrum_message_cache_qlc.by_channel(
           channel_id,
           after_timestamp,
           before_timestamp,
-          @configured_cache
+          cache
         )
         |> :qlc.e()
       end)
@@ -177,17 +182,22 @@ defmodule Nostrum.Cache.MessageCache do
   @spec get_by_author(User.id(), timestamp_like(), timestamp_like() | :infinity) :: [
           Message.t()
         ]
-  def get_by_author(author_id, after_timestamp \\ 0, before_timestamp \\ :infinity) do
+  def get_by_author(
+        author_id,
+        after_timestamp \\ 0,
+        before_timestamp \\ :infinity,
+        cache \\ @configured_cache
+      ) do
     after_timestamp = timestamp_like_to_snowflake(after_timestamp)
     before_timestamp = timestamp_like_to_snowflake(before_timestamp)
 
     unsorted_result =
-      wrap_qlc(fn ->
+      wrap_qlc(cache, fn ->
         :nostrum_message_cache_qlc.by_author(
           author_id,
           after_timestamp,
           before_timestamp,
-          @configured_cache
+          cache
         )
         |> :qlc.e()
       end)
@@ -211,19 +221,20 @@ defmodule Nostrum.Cache.MessageCache do
         channel_id,
         author_id,
         after_timestamp \\ 0,
-        before_timestamp \\ :infinity
+        before_timestamp \\ :infinity,
+        cache \\ @configured_cache
       ) do
     after_timestamp = timestamp_like_to_snowflake(after_timestamp)
     before_timestamp = timestamp_like_to_snowflake(before_timestamp)
 
     unsorted_result =
-      wrap_qlc(fn ->
+      wrap_qlc(cache, fn ->
         :nostrum_message_cache_qlc.by_channel_and_author(
           channel_id,
           author_id,
           after_timestamp,
           before_timestamp,
-          @configured_cache
+          cache
         )
         |> :qlc.e()
       end)

diff --git a/src/nostrum_message_cache_qlc.erl b/src/nostrum_message_cache_qlc.erl
@@ -101,21 +101,21 @@ by_channel_and_author(RequestedChannelId, RequestedUserId, After, Before, Cache)
 % with a message id greater than After and less than Before.
 -spec by_author(
     'Elixir.Nostrum.Struct.User':id(),
-    Before :: non_neg_integer(),
     After :: non_neg_integer(),
+    Before :: non_neg_integer(),
     module()
 ) -> qlc:query_handle().
-by_author(RequestedUserId, Before, After, ?MNESIA_CACHE) ->
+by_author(RequestedUserId, After, Before, ?MNESIA_CACHE) ->
     qlc:q([
-        {MessageId, Message}
+        Message
      || {_Tag, MessageId, _ChannelId, AuthorId, Message} <- ?MNESIA_CACHE:query_handle(),
         AuthorId =:= RequestedUserId,
         MessageId =< Before,
         MessageId >= After
     ]);
-by_author(RequestedUserId, Before, After, Cache) ->
+by_author(RequestedUserId, After, Before, Cache) ->
     qlc:q([
-        {MessageId, Message}
+        Message
      || {MessageId, #{author := #{id := AuthorId}} = Message} <- Cache:query_handle(),
         AuthorId =:= RequestedUserId,
         MessageId =< Before,