Further bugfixes

database/backends/PostgresSmartBackend.php

@@ -37,14 +37,16 @@ class PostgresSmartBackend implements Backend
             SELECT
               ranked_messages.bufferid,
               ranked_messages.buffername,
-              network.networkname,
+              ranked_messages.networkname,
               ranked_messages.messageid,
               ranked_messages.time,
-              sender.sender,
+              ranked_messages.sender,
               ts_headline(replace(replace(ranked_messages.message, '<', '&lt;'), '>', '&gt;'), query, 'HighlightAll=TRUE') AS message
             FROM
               (SELECT
                  matching_messages.*,
+                 network.networkname,
+                 sender.sender,
                  rank()
                  OVER (
                    PARTITION BY matching_messages.bufferid
@@ -78,7 +80,7 @@ class PostgresSmartBackend implements Backend
                   FROM
                     backlog
                     JOIN buffer ON backlog.bufferid = buffer.bufferid
-                    , $tsQueryFunction query
+                    , phraseto_tsquery_multilang(:query) query
                   WHERE buffer.userid = :userid
                     AND (:ignore_since::BOOLEAN OR backlog.time > :since::TIMESTAMP)
                     AND (:ignore_before::BOOLEAN OR backlog.time < :before::TIMESTAMP)
@@ -86,12 +88,12 @@ class PostgresSmartBackend implements Backend
                     AND backlog.type & 23559 > 0
                     AND backlog.tsv @@ query
                  ) matching_messages
+                JOIN sender ON matching_messages.senderid = sender.senderid
+                JOIN network ON matching_messages.networkid = network.networkid
+                WHERE (:ignore_network::BOOLEAN OR network.networkname ~* :network)
+                  AND (:ignore_sender::BOOLEAN OR sender.sender ~* :sender)
               ) ranked_messages
-              JOIN sender ON ranked_messages.senderid = sender.senderid
-              JOIN network ON ranked_messages.networkid = network.networkid
             WHERE ranked_messages.rank <= :limit
-              AND (:ignore_network::BOOLEAN OR network.networkname ~* :network)
-              AND (:ignore_sender::BOOLEAN OR sender.sender ~* :sender)
             ORDER BY ranked_messages.max_rank_value DESC, ranked_messages.rank_value DESC
         ");
     }

res/css/_content.sass

@@ -20,6 +20,10 @@
     margin-bottom: 20px
     position: relative
 
+    &.focus:not(.hasmore)
+      .inline-button
+        display: none
+
     .title
       border-bottom: 1px solid transparent
       border-top: 1px solid transparent

res/css/search.css

@@ -407,6 +407,10 @@ body {
     margin-top: 0;
     margin-bottom: 20px;
     position: relative; }
+
+.results .buffer.focus:not(.hasmore) .inline-button {
+    display: none;
+}
     .results .buffer .title {
       border-bottom: 1px solid transparent;
       border-top: 1px solid transparent;

res/js/component/buffer.js

 class Buffer extends Component {
     constructor(id, name, network, hasMore, contextList = []) {
         super();
+        console.log(id + ':' + name + ':' + hasMore);
         this.id = id;
         this.name = name;
         this.network = network;
         this.contextList = contextList;
         this.render();
         this.contextList.forEach(context => this.insert(context));
-        this.loadMoreBtn.setVisible(hasMore);
         this.hasMore = hasMore;
         this.loading = false;
         this.neverLoaded = true;
+        this.loadMoreBtn.setVisible(hasMore);
     }
     render() {
         this.elem = function () {
@@ -84,7 +85,7 @@ class Buffer extends Component {
             this.insert(context);
         });
         this.hasMore = resultSet.hasmore;
-        this.loadMoreBtn.setVisible(this.hasMore);
+        this.elem.classList.toggle('hasmore', this.hasMore);
     }
     insert(context) {
         let container = this.insertContainerFirst.childElementCount < 4 ? this.insertContainerFirst : this.insertContainer;

res/js/component/buffer.jsx

@@ -2,6 +2,8 @@ class Buffer extends Component {
     constructor(id, name, network, hasMore, contextList = []) {
         super();
 
+        console.log(id + ":" + name + ":" + hasMore);
+
         this.id = id;
         this.name = name;
         this.network = network;
@@ -9,11 +11,12 @@ class Buffer extends Component {
 
         this.render();
         this.contextList.forEach((context) => this.insert(context));
-        this.loadMoreBtn.setVisible(hasMore);
 
         this.hasMore = hasMore;
         this.loading = false;
         this.neverLoaded = true;
+
+        this.loadMoreBtn.setVisible(hasMore);
     }
 
     render() {
@@ -78,7 +81,7 @@ class Buffer extends Component {
                 this.insert(context)
             });
         this.hasMore = resultSet.hasmore;
-        this.loadMoreBtn.setVisible(this.hasMore);
+        this.elem.classList.toggle('hasmore', this.hasMore);
     }
 
     insert(context) {