Inverts the name of the isFilledFilter function
This commit is contained in:
+1
-1
@@ -327,7 +327,7 @@ class QueryBuilder(
|
|||||||
filter: Filter,
|
filter: Filter,
|
||||||
hasher: TagNameValueHasher,
|
hasher: TagNameValueHasher,
|
||||||
): QuerySpec? {
|
): QuerySpec? {
|
||||||
if (!filter.isFilledFilter()) return null
|
if (filter.isEmpty()) return null
|
||||||
|
|
||||||
val mustJoinSearch = (filter.search != null)
|
val mustJoinSearch = (filter.search != null)
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -35,10 +35,10 @@ class RelayBasedFilter(
|
|||||||
fun List<RelayBasedFilter>.groupByRelay(): Map<NormalizedRelayUrl, List<Filter>> {
|
fun List<RelayBasedFilter>.groupByRelay(): Map<NormalizedRelayUrl, List<Filter>> {
|
||||||
val result = mutableMapOf<NormalizedRelayUrl, MutableList<Filter>>()
|
val result = mutableMapOf<NormalizedRelayUrl, MutableList<Filter>>()
|
||||||
for (relayBasedFilter in this) {
|
for (relayBasedFilter in this) {
|
||||||
if (relayBasedFilter.filter.isFilledFilter()) {
|
if (relayBasedFilter.filter.isEmpty()) {
|
||||||
result.getOrPut(relayBasedFilter.relay) { mutableListOf() }.add(relayBasedFilter.filter)
|
|
||||||
} else {
|
|
||||||
Log.e("FilterError", "Ignoring empty filter for ${relayBasedFilter.relay}")
|
Log.e("FilterError", "Ignoring empty filter for ${relayBasedFilter.relay}")
|
||||||
|
} else {
|
||||||
|
result.getOrPut(relayBasedFilter.relay) { mutableListOf() }.add(relayBasedFilter.filter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
|
|||||||
+11
-11
@@ -74,18 +74,18 @@ class Filter(
|
|||||||
) = Filter(ids, authors, kinds, tags, tagsAll, since, until, limit, search)
|
) = Filter(ids, authors, kinds, tags, tagsAll, since, until, limit, search)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if this filter contains any non-null and non-empty criteria.
|
* Returns true if this filter doesn't filter for anything.
|
||||||
*/
|
*/
|
||||||
fun isFilledFilter() =
|
fun isEmpty() =
|
||||||
(ids != null && ids.isNotEmpty()) ||
|
(ids == null || ids.isEmpty()) &&
|
||||||
(authors != null && authors.isNotEmpty()) ||
|
(authors == null || authors.isEmpty()) &&
|
||||||
(kinds != null && kinds.isNotEmpty()) ||
|
(kinds == null || kinds.isEmpty()) &&
|
||||||
(tags != null && tags.isNotEmpty() && tags.values.all { it.isNotEmpty() }) ||
|
(tags == null || tags.isEmpty() && tags.values.all { it.isNotEmpty() }) &&
|
||||||
(tagsAll != null && tagsAll.isNotEmpty() && tagsAll.values.all { it.isNotEmpty() }) ||
|
(tagsAll == null || tagsAll.isEmpty() && tagsAll.values.all { it.isNotEmpty() }) &&
|
||||||
(since != null) ||
|
(since == null) &&
|
||||||
(until != null) ||
|
(until == null) &&
|
||||||
(limit != null) ||
|
(limit == null) &&
|
||||||
(search != null && search.isNotEmpty())
|
(search == null || search.isEmpty())
|
||||||
|
|
||||||
init {
|
init {
|
||||||
ids?.forEach {
|
ids?.forEach {
|
||||||
|
|||||||
Reference in New Issue
Block a user