libertree-model 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f26c40457eee333ca5e41f43641188d00fcb06d5c5f5eb9dcd9d3c65e262d89
-  data.tar.gz: c8ccc4d3da0d8a7b804e9f985e234310139cd01a139812dea05ec5cee03da49b
+  metadata.gz: e5571a9aaefa5aabcc1a15a11bd9eac49a49aed6a16cdcb6ce33cf13706abe66
+  data.tar.gz: bac9a39c327eb71527c7473d655e91349d5275953fb2075567a723eb2f88a2f8
 SHA512:
-  metadata.gz: 3ab95ddb06996c91860ae1cf44b121e565febe27263535080458d1cbddb173e99791ee135c4f4711528b16d3c04313b1f6a8465e0db4d055ee3b32b97f82ed35
-  data.tar.gz: 29823f4307bfb836011b98413b05e911d3baea0ee885fab27d48659be14a4b776f348d4714302b8f5c0ccd25028fc485e654a9bf2e5b89fe5024028ec88df1cd
+  metadata.gz: 525a5546eb0f68a0d65521c9574926e70aee266a6a7088a3bfa1af1677b321dd42584a60bb1cd612e34542aa13cef407127e5e68ec6e1b33d746ccded4cb806c
+  data.tar.gz: 1b7aa3baeb1430d6805f55b72d3fdab9419c7c9e7e3047ea771837c75436db20b2e8cb527e30c8b63432104617fda86d5ca038f8f2c417298286d22bd78c8ac9

data/lib/libertree/model/account.rb

@@ -42,8 +42,13 @@ module Libertree
 
       def self.authenticate_db(creds)
         if creds['password_reset_code'].to_s
-          account = Account.where(%{password_reset_code = ? AND NOW() <= password_reset_expiry},
-                                  creds['password_reset_code'].to_s).first
+          account = Account.where(
+            Sequel.lit(
+              %{password_reset_code = ? AND NOW() <= password_reset_expiry},
+              creds['password_reset_code'].to_s
+            )
+          ).first
+
           if account
             return account
           end
@@ -286,7 +291,9 @@ module Libertree
       end
 
       def invitations_not_accepted
-        Invitation.where("inviter_account_id = ? AND account_id IS NULL", self.id).order(:id).all
+        Invitation.where(
+          Sequel.lit("inviter_account_id = ? AND account_id IS NULL", self.id)
+        ).order(:id).all
       end
 
       def new_invitation
@@ -362,7 +369,10 @@ module Libertree
       # @return [Boolean] true iff password reset was successfully set up
       def self.set_up_password_reset_for(email)
         # TODO: Don't allow registration of accounts with the same email but different case
-        account = self.where('LOWER(email) = ?', email.downcase).first
+        account = self.where(
+          Sequel.lit('LOWER(email) = ?', email.downcase)
+        ).first
+
         if account
           account.password_reset_code = SecureRandom.hex(16)
           account.password_reset_expiry = Time.now + 60 * 60

data/lib/libertree/model/chat-message.rb

@@ -67,8 +67,13 @@ module Libertree
       def self.mark_seen_between(account, member_id)
         return  if account.nil?
 
-        self.where("from_member_id = ? AND to_member_id = ?", member_id.to_i, account.member.id).
-          update(seen: true)
+        self.where(
+          Sequel.lit(
+            "from_member_id = ? AND to_member_id = ?",
+            member_id.to_i,
+            account.member.id
+          )
+        ).update(seen: true)
       end
     end
   end

data/lib/libertree/model/has-searchable-text.rb

@@ -9,10 +9,12 @@ module Libertree
         else
           dict = 'english'
         end
-        self.where("(to_tsvector('simple', text) || to_tsvector('english', text)) @@ plainto_tsquery('#{dict}', ?)", q).
-          reverse_order(:time_created).
-          limit(limit.to_i).
-          all
+
+        self.where(
+          Sequel.lit("(to_tsvector('simple', text) || to_tsvector('english', text)) @@ plainto_tsquery('#{dict}', ?)", q)
+        ).reverse_order(:time_created)
+        .limit(limit.to_i)
+        .all
       end
     end
   end

data/lib/libertree/model/job.rb

@@ -45,7 +45,12 @@ module Libertree
 
       # @return [Job] nil if no job was reserved
       def self.reserve(tasks)
-        job = self.where("task IN ? AND pid IS NULL AND tries < #{MAX_TRIES} AND time_to_start <= NOW()", tasks).order(:time_to_start).limit(1).first
+        job = self.where(
+          Sequel.lit("task IN ? AND pid IS NULL AND tries < #{MAX_TRIES} AND time_to_start <= NOW()", tasks)
+        ).order(:time_to_start)
+        .limit(1)
+        .first
+
         return nil  if job.nil?
 
         self.where({ id: job.id, pid: nil }).
@@ -72,20 +77,22 @@ module Libertree
         params = args[1..-1]
 
         self.where(
-          query + %{
-            AND time_finished IS NULL
-            AND tries < ?
-          },
-          *params,
-          MAX_TRIES
+          Sequel.lit(
+            query + %{
+              AND time_finished IS NULL
+              AND tries < ?
+            },
+            *params,
+            MAX_TRIES
+          )
         )
       end
 
       def self.unfinished(task=nil)
         if task
-          self.where("task = ? AND time_finished IS NULL", task).all
+          self.where(Sequel.lit("task = ? AND time_finished IS NULL", task)).all
         else
-          self.where("time_finished IS NULL").all
+          self.where(Sequel.lit("time_finished IS NULL")).all
         end
       end
     end

data/lib/libertree/model/member.rb

@@ -80,18 +80,23 @@ module Libertree
         if local
           self.qualify.
             join(:accounts, :id=>:account_id).
-            where(:accounts__username => username).
+            where(Sequel.qualify(:accounts, :username) => username).
             limit(1).
             first
         else
           # TODO: servers.name_given is no longer used.  Remove it after
           # migrating user rivers/contact lists etc.
-          self.qualify.
-            join(:servers, :id=>:server_id).
-            where(:members__username => username).
-            where(Sequel.or(:servers__domain => host, :servers__name_given => host)).
-            limit(1).
-            first
+          self.qualify
+            .join(:servers, :id=>:server_id)
+            .where(Sequel.qualify(:members, :username) => username)
+            .where(
+              Sequel.or(
+                Sequel.qualify(:servers, :domain) => host,
+                Sequel.qualify(:servers, :name_given) => host
+              )
+            )
+            .limit(1)
+            .first
         end
       end
 
@@ -100,7 +105,7 @@ module Libertree
       def self.with_display_name(name)
         self.qualify.
           join(:profiles, :member_id=>:id).
-          where(:profiles__name_display => name).
+          where(Sequel.qualify(:profiles, :name_display) => name).
           limit(1).
           first
       end

data/lib/libertree/model/node_subscription.rb

@@ -7,6 +7,7 @@ module Libertree
                  :subscribed ]
 
       many_to_one :node
+      set_primary_key :id
 
       def self.for(jid_or_host)
         return self  unless jid_or_host
@@ -14,7 +15,7 @@ module Libertree
         if jid_or_host.include?('@')
           self.where(jid: jid_or_host)
         else
-          host_pattern = self.where.escape_like(jid_or_host.to_s)
+          host_pattern = self.where(Sequel.lit('true')).escape_like(jid_or_host.to_s)
           self.where(Sequel.like(:jid, "%@#{host_pattern}"))
         end
       end

data/lib/libertree/model/notification.rb

@@ -46,8 +46,14 @@ module Libertree
       end
 
       def self.mark_seen_for_account_and_message(account, message)
-        self.where("account_id = ? AND data = ?", account.id, %|{"type":"message","message_id":#{message.id}}|).
-          update(seen: true)
+        self.where(
+          Sequel.lit(
+            "account_id = ? AND data = ?",
+            account.id,
+            %|{"type":"message","message_id":#{message.id}}|
+          )
+        ).update(seen: true)
+
         account.dirty
       end
 

data/lib/libertree/model/post.rb

@@ -96,7 +96,13 @@ module Libertree
       def mark_as_unread_by_all( options = {} )
         except_accounts = options.fetch(:except, [])
         if except_accounts.any?
-          DB.dbh[:posts_read].where('post_id = ? AND NOT account_id IN ?', self.id, except_accounts.map(&:id)).delete
+          DB.dbh[:posts_read].where(
+            Sequel.lit(
+              'post_id = ? AND NOT account_id IN ?',
+              self.id,
+              except_accounts.map(&:id)
+            )
+          ).delete
         else
           DB.dbh[ "DELETE FROM posts_read WHERE post_id = ?", self.id ].get
         end
@@ -351,47 +357,47 @@ module Libertree
         posts.
           qualify.
           left_outer_join(:posts_hidden,
-                          :posts_hidden__post_id => :posts__id,
-                          :posts_hidden__account_id => account.id).
-          where(:posts_hidden__post_id => nil)
+                          Sequel.qualify(:posts_hidden, :post_id) => Sequel.qualify(:posts, :id),
+                          Sequel.qualify(:posts_hidden, :account_id) => account.id).
+          where(Sequel.qualify(:posts_hidden, :post_id) => nil)
       end
 
       def self.read_by(account, posts=self)
         posts.
           qualify.
           join(:posts_read,
-               :posts_read__post_id => :posts__id,
-               :posts_read__account_id => account.id)
+               Sequel.qualify(:posts_read, :post_id) => Sequel.qualify(:posts, :id),
+               Sequel.qualify(:posts_read, :account_id) => account.id)
       end
 
       def self.unread_by(account, posts=self)
         posts.
           qualify.
           left_outer_join(:posts_read,
-                          :posts_read__post_id => :posts__id,
-                          :posts_read__account_id => account.id).
-          where(:posts_read__post_id => nil)
+                          Sequel.qualify(:posts_read, :post_id) => Sequel.qualify(:posts, :id),
+                          Sequel.qualify(:posts_read, :account_id) => account.id).
+          where(Sequel.qualify(:posts_read, :post_id) => nil)
       end
 
       def self.liked_by(member, posts=self)
         posts.
           qualify.
           join(:post_likes,
-               :post_likes__post_id => :posts__id,
-               :post_likes__member_id => member.id)
+               Sequel.qualify(:post_likes, :post_id) => Sequel.qualify(:posts, :id),
+               Sequel.qualify(:post_likes, :member_id) => member.id)
       end
 
       def self.without_liked_by(member, posts=self)
         posts.
           qualify.
           join(:post_likes,
-               :post_likes__post_id => :posts__id,
-               :post_likes__member_id => member.id)
+               Sequel.qualify(:post_likes, :post_id) => Sequel.qualify(:posts, :id),
+               Sequel.qualify(:post_likes, :member_id) => member.id)
       end
 
       def self.commented_on_by(member, posts=self)
         posts.
-          where(:posts__id => Comment.
+          where(Sequel.qualify(:posts, :id) => Comment.
                 select(:post_id).
                 distinct(:post_id).
                 where(:member_id => member.id))
@@ -399,7 +405,7 @@ module Libertree
 
       def self.without_commented_on_by(member, posts=self)
         posts.
-          exclude(:posts__id => Comment.
+          exclude(Sequel.qualify(:posts, :id) => Comment.
                   select(:post_id).
                   distinct(:post_id).
                   where(:member_id => member.id))
@@ -409,17 +415,17 @@ module Libertree
         posts.
           qualify.
           join(:post_subscriptions,
-               :post_subscriptions__post_id => :posts__id,
-               :post_subscriptions__account_id => account.id)
+               Sequel.qualify(:post_subscriptions, :post_id) => Sequel.qualify(:posts, :id),
+               Sequel.qualify(:post_subscriptions, :account_id) => account.id)
       end
 
       def self.without_subscribed_to_by(account, posts=self)
         posts.
           qualify.
           left_outer_join(:post_subscriptions,
-                          :post_subscriptions__post_id => :posts__id,
-                          :post_subscriptions__account_id => account.id).
-          where(:post_subscriptions__post_id => nil)
+                          Sequel.qualify(:post_subscriptions, :post_id) => Sequel.qualify(:posts, :id),
+                          Sequel.qualify(:post_subscriptions, :account_id) => account.id).
+          where(Sequel.qualify(:post_subscriptions, :post_id) => nil)
       end
 
       def self.filter_by_query(parsed_query, account, posts=self)
@@ -518,13 +524,19 @@ module Libertree
 
           # filter by simple terms first to avoid having to check so many posts
           # TODO: prevent empty arguments to to_tsquery
-          posts = posts.where(%{to_tsvector('simple', text)
-                               @@ (to_tsquery('simple', ?)
-                               && to_tsquery('simple', ?)
-                               && to_tsquery('simple', ?))},
-                             words[:negations].map{|w| "!#{w}" }.join(' & '),
-                             words[:requirements].join(' & '),
-                             words[:regular].join(' | '))
+          posts = posts.where(
+            Sequel.lit(
+              %{
+                to_tsvector('simple', text)
+                @@ (to_tsquery('simple', ?)
+                && to_tsquery('simple', ?)
+                && to_tsquery('simple', ?))
+              },
+              words[:negations].map{|w| "!#{w}" }.join(' & '),
+              words[:requirements].join(' & '),
+              words[:regular].join(' | ')
+            )
+          )
         end
 
         { 'visibility' => :visibility,
@@ -618,14 +630,16 @@ module Libertree
 
         get_comments = lambda do
           comments = Comment.on_post(post, viewing_account: viewing_account)
-          comment_likes = CommentLike.where('comment_id IN ?', comments.map(&:id)).reduce({}) do |hash, like|
+          comment_likes = CommentLike.where(
+            Sequel.lit('comment_id IN ?', comments.map(&:id))
+          ).reduce({}) { |hash, like|
             if hash[like.comment_id]
               hash[like.comment_id] << like
             else
               hash[like.comment_id] = [like]
             end
             hash
-          end
+          }
 
           comments.map do |comment|
             likes = if comment_likes[comment.id]
@@ -699,9 +713,14 @@ module Libertree
       end
 
       def pools_by_member(member_id)
-        Libertree::Model::Pool.qualify.
-          join(:pools_posts, :pools_posts__pool_id => :pools__id).
-          where(pools_posts__post_id: self.id, pools__member_id: member_id)
+        Libertree::Model::Pool.qualify
+          .join(
+            :pools_posts,
+            Sequel.qualify(:pools_posts, :pool_id) => Sequel.qualify(:pools, :id)
+          ).where(
+            Sequel.qualify(:pools_posts, :post_id) => self.id,
+            Sequel.qualify(:pools, :member_id) => member_id
+          )
       end
 
       def update_collection_status_for_member(member_id, pool_ids)

data/lib/libertree/model/profile.rb

@@ -18,7 +18,11 @@ module Libertree
       end
 
       def self.search(query)
-        self.where("(to_tsvector('simple', description) || to_tsvector('english', description)) @@ plainto_tsquery(?)", query).or("name_display ILIKE '%' || ? || '%'", query)
+        self.where(
+          Sequel.lit("(to_tsvector('simple', description) || to_tsvector('english', description)) @@ plainto_tsquery(?)", query)
+        ).or(
+          Sequel.lit("name_display ILIKE '%' || ? || '%'", query)
+        )
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libertree-model
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Pistos
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
@@ -57,16 +57,16 @@ dependencies:
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.34.0
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement