elephrame 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481e8c79f0c12a0037677a1eabc2b2676d97baf08376dc9e9c142a35ba13de2f
-  data.tar.gz: 514d4b9a9a8c2461cb094fd44bbbe983e91ec98c4b0a3c01b2c16abf05a29f90
+  metadata.gz: 3c90f8c93681c54e2bea70e936a0b385e18b27e113af9ab920261b33b8966860
+  data.tar.gz: d231bce287036398f6100fe510b6b7299bbe742bc8e490dbaaf56c1c771226ac
 SHA512:
-  metadata.gz: 83021602cec5f175c20977ceb9db566f376882e30b1e5bdde8582283d84ad401215facda9b943950a06eb167e34c027cf6d04b598a3a3e9a0e676937d1f5d8cd
-  data.tar.gz: a3dac577c9c91a1d1b2fdea09d6a7211601fdeb3f5bdbb7524c855285a9ab7c47998acf867ab8a51ef80ffa58dea611fbf027e9a4cf825cbf88a3683ecb71f44
+  metadata.gz: 513660fa5de9fceac2645e4eacf52c7feaedfe52ec45a7d3bb3c66e930aa3c1360e5e4b9c23daa460381da5b28032eefa2edf91de9e6774726aea939a06cc122
+  data.tar.gz: 7cf67f91aaec15bb866cd543a7335d1813bcd11cc74ba25f86586416fe659e834756f8ed44d69aeec844ffdd5dff88de3d199463d20a1f45eb4428ea4ce01222

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elephrame (0.5.1)
+    elephrame (0.5.2)
       htmlentities (~> 4.0)
       moo_ebooks (~> 1)
       moostodon (~> 0.4.0)
@@ -11,15 +11,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     buftok (0.2.0)
     concurrent-ruby (1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    et-orbi (1.2.1)
+    et-orbi (1.2.2)
       tzinfo
-    fugit (1.3.1)
+    fugit (1.3.3)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     highscore (1.2.1)
@@ -43,8 +43,8 @@ GEM
       buftok (~> 0)
       http (~> 3.0)
       oj (~> 3.3)
-    oj (3.8.1)
-    public_suffix (3.1.1)
+    oj (3.9.1)
+    public_suffix (4.0.1)
     raabro (1.1.6)
     rake (10.5.0)
     rufus-scheduler (3.6.0)

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 
 ## Quickstart
 
-bot that posts "i'm gay" every three hours:
+bot that posts "trans right are human rights" every three hours:
 
 ```ruby
 require 'elephrame'
@@ -35,7 +35,7 @@ require 'elephrame'
 my_bot = Elephrame::Bots::Periodic.new '3h'
 
 my_bot.run do |bot|
-  bot.post("i'm gay")
+  bot.post("trans rights are human rights")
 end
 ```
 
@@ -56,8 +56,12 @@ So far the framework support 6 bot types: Periodic, Interact, PeroidInteract, Re
 - `Command` supports running code when mentioned with commands it recognizes
 - `Watcher` supports watching streaming timelines (including lists, hashtags, public timeline, local timeline, and user timeline)
 - `TraceryBot` supports automatically loading tracery rules. Overloads post method to automatically expand any text passed through it. This bot type provides certain options that ease the use of tracery grammar rules, please see examples and/or documentation for more explanation.
+- `EbooksBot` provides a very quick and easy way to create an ebooks bot. Please see the example in the examples folder for a detailed explanation. 
+- `MarkovBot` provides a quick way to get started with making markov bots. Please see the example in the examples folder.
 
-The string passed to `Periodic` and `PeroidInteract` must be either a 'Duration' string or a 'Cron' string, as parsable by [fugit](https://github.com/floraison/fugit)
+Both the Ebooks and Markov bots support a few commands out of the box. `!delete`, `!filter`, and `!help`. These commands will only work when sent from an account that the bot is following. The Ebooks bot supports `!update` as well.
+
+Any time a 'time' string is needed it must be either a 'Duration' or 'Cron' string as parsable by [fugit](https://github.com/floraison/fugit)
 
 ## Usage
 

data/lib/elephrame/bot.rb

@@ -1,4 +1,6 @@
 require 'net/http'
+require 'digest'
+require 'time'
 
 module Elephrame  
   module Bots
@@ -12,6 +14,7 @@ module Elephrame
       attr_accessor :strip_html, :max_retries
 
       NoBotRegex = /#?NoBot/i
+      FNGabLink  = 'https://fediverse.network/mastodon?build=gab'
 
       ##
       # Sets up our REST +client+, gets and saves our +username+, sets default
@@ -20,6 +23,9 @@ module Elephrame
       # @return [Elephrame::Bots::BaseBot]
       
       def initialize
+
+        raise "Fuck off Gabber" if Net::HTTP.get(URI.parse(FNGabLink)).include? URI.parse(ENV['INSTANCE']).host
+        
         @client = Mastodon::REST::Client.new(base_url: ENV['INSTANCE'],
                                              bearer_token: ENV['TOKEN'])
         @username = @client.verify_credentials().acct
@@ -55,10 +61,16 @@ module Elephrame
           spoiler_text: spoiler,
           in_reply_to_id: reply_id,
           media_ids: @failed[:media] ? [] : uploaded_ids,
-          sensitive: hide_media,
+          sensitive: hide_media
         }
 
+        # create a unique key for the status
+        #  this key prevents a status from being posted more than once
+        #  SHOULD be unique enough, by smooshing time and content together
+        idempotency = Digest::SHA256.hexdigest("#{Time.now}#{text}")
+        
         @failed[:post] = retry_if_needed {
+          options[:headers] = { "Idempotency-Key" => idempotency }
           @client.create_status text, options
         }
       end

data/lib/elephrame/mix/bots.rb

@@ -73,7 +73,7 @@ module Elephrame
         # set up our bot stuff
         setup_scheduler interval
         setup_streaming
-        setup_tracery dirs
+        setup_tracery *dirs
       end
 
       ##
@@ -295,6 +295,18 @@ module Elephrame
         super
       end
 
+      ##
+      # overloads the super's help method
+      #
+      # @returns [String] default help text
+
+      def default_help
+        txt = []
+        txt << '!update -- tells the bot to manually fetch new posts'
+        txt << super
+        txt.join '\n'
+      end
+      
       private
 
       ##

data/lib/elephrame/mix/tracery.rb

@@ -15,8 +15,7 @@ module Elephrame
     # @param dirs [String] path to the directory containing the tracery rules
     
     def setup_tracery *dirs
-      raise "Provided path not a directory" unless Dir.exist?(dir_path)
-
+      
       @grammar = {}
 
       dirs.each do |directory|
@@ -27,7 +26,7 @@ module Elephrame
             
             # read the rule file into the files hash
             @grammar[file.split('.').first] =
-              createGrammar(JSON.parse(File.read("#{dir_path}/#{file}")))
+              createGrammar(JSON.parse(File.read("#{directory}/#{file}")))
           end
         end
       end

data/lib/elephrame/version.rb

@@ -1,3 +1,3 @@
 module Elephrame
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elephrame
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Zac
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A framework for assisting in making mastodon/pleroma bots