Merge 1174cf4861 into 61b9f81e39

client/html/post_readonly_sidebar.tpl

@@ -58,7 +58,7 @@
             Search on
             <a href='http://iqdb.org/?url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>IQDB</a> &middot;
             <a href='https://danbooru.donmai.us/posts?tags=md5:<%- ctx.post.checksumMD5 %>'>Danbooru</a> &middot;
-            <a href='https://www.google.com/searchbyimage?&image_url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>Google Images</a>
+            <a href='https://lens.google.com/uploadbyurl?url=<%- encodeURIComponent(ctx.post.fullContentUrl) %>'>Google Images</a>
         </section>
 
         <section class='social'>

server/szurubooru/search/configs/util.py

@@ -124,11 +124,11 @@ def apply_str_criterion_to_column(
     transformer: Callable[[str], str] = wildcard_transformer,
 ) -> SaQuery:
     if isinstance(criterion, criteria.PlainCriterion):
-        expr = column.ilike(transformer(criterion.value))
+        expr = sa.and_(column != None, column.ilike(transformer(criterion.value)))
     elif isinstance(criterion, criteria.ArrayCriterion):
         expr = sa.sql.false()
         for value in criterion.values:
-            expr = expr | column.ilike(transformer(value))
+            expr = expr | sa.and_(column != None, column.ilike(transformer(value)))
     elif isinstance(criterion, criteria.RangedCriterion):
         raise errors.SearchError(
             "Ranged criterion is invalid in this context. "