elephrame 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041bac1a80ecb71d3a0da5c2af2f24ec9302457c8663efe0acad6cfaabbb57f4
-  data.tar.gz: fdf9594ab59e48986b3e8c92f22c3da7c8f696e2b014197b42ea7897bc368f7d
+  metadata.gz: 925f58429ac0d48573209e51c2ad09fbc030d9b3ab3eb138f49219ed672aaac6
+  data.tar.gz: efff93a265abf97c14c8e37a02676bacd2b02967a61d0d422233ddfe097a85f3
 SHA512:
-  metadata.gz: 55ea90d7f5b18997aa31d5662b2261728a2a6a407ff2d5ebec9f78796d3df0a7f45fff54a7686adde3768db011f89425dbaae81da5e9e0e3180887732fd16611
-  data.tar.gz: 4ebfbcdbfafddfd91b1da93bf71f265d6b499a2f43d58abe3af4a45cad948f2e7063b463da74a47048d5fc810bb34f9f6efbc77f49c93667628c2655c5bdb988
+  metadata.gz: 1e5dfe1f3bfc1ded1c5f79dfe8d9f9b498fe916e0276e6b8aaeebd954526447155b7f8430b9ae1ef50666e869d1ca0dbcb28e3d2c454ac43c2a1b26d71521b24
+  data.tar.gz: 3dc7ba9f4161d0dbccb83925c13094e24756b49db9c466511cca1ab27de73fbe3864fe295b91ccf6df9a18e60d79dc744165d4fd378cd37cc17f1aa4ba4bf39d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elephrame (0.4.0)
+    elephrame (0.4.1)
       moostodon (~> 0.2.0)
       rufus-scheduler
 

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/elephrame.svg)](https://badge.fury.io/rb/elephrame)
 [RubyDoc](https://www.rubydoc.info/github/theZacAttacks/elephrame/)
 
-Elephant-Framework
+Elephant-Framework -- by [zac@computerfox.xyz](https://social.computerfox.xyz/@zac)
 
 A framework that helps simplify the creation of bots for mastodon/pleroma
 
@@ -45,7 +45,7 @@ Check the [examples](https://github.com/theZacAttacks/elephrame/tree/master/exam
 
 ### Bot Types
 
-So far the framework support 4 bot types: Periodic, Interact, PeroidInteract, Reply
+So far the framework support 5 bot types: Periodic, Interact, PeroidInteract, Reply, Command
 
 - `Periodic` supports posting on a set schedule
 - `Interact` supports callbacks for each type of interaction (favorites, boosts, replies, follows)

data/examples/combined.rb

@@ -3,8 +3,7 @@ require 'elephrame'
 mix = Elephrame::Bots::PeriodInteract.new '30s'
 
 mix.on_reply { |bot, post|
-  bot.post("@#{post.account.acct} Thanks for helping me test stuff :3",
-           reply_id: post.id, visibility: post.visibility)
+  bot.reply("Thanks for helping me test stuff :3")
 }
 
 mix.on_fave { |bot, notif|

data/examples/command.rb

@@ -7,22 +7,22 @@ Genders   = [ 'sweet', 'sour', 'bitter', 'creamy', 'umami' ]
 cmd_bot = Elephrame::Bots::Command.new '!', 'mention me with !candy to get candy, or !gender to get a gender'
 
 # add in the candy command
-cmd_bot.add_command 'candy' do |bot, data, status|
-  bot.reply("@#{status.account.acct} here's some candy!
+cmd_bot.add_command 'candy' do |bot|
+  bot.reply("here's some candy!
 *gives you a #{Candy.sample}*",
             spoiler: 'candy')
 end
 
 # add in the gender command
-cmd_bot.add_command 'gender' do |bot, data, status|
-  bot.reply("@#{status.account.acct} here's a spare gender!
+cmd_bot.add_command 'gender' do |bot|
+  bot.reply("here's a spare gender!
 *gives you a #{Genders.sample} gender*",
             spoiler: 'gender shitpost')
 end
 
 # if the command is not found
-cmd_bot.if_not_found do |bot, status|
-  bot.reply("@#{status.account.acct} I didn't recognize that! Respond with !help to get usage info")
+cmd_bot.if_not_found do |bot|
+  bot.reply("I didn't recognize that! Respond with !help to get usage info")
 end
 
 cmd_bot.run

data/examples/interact.rb

@@ -2,13 +2,13 @@ require 'elephrame'
 
 interacter = Elephrame::Bots::Interact.new
 
-interacter.on_reply { |bot, post|
+interacter.on_reply { |bot|
 
   #bot.post("@#{post.account.acct} Thanks for helping me test stuff :3",
   #           reply_id: post.id, visibility: post.visibility)
   
   ## this can be simplified to one line
-  bot.reply("@#{post.account.acct} Thanks for helping me test stuff :3")
+  bot.reply("Thanks for helping me test stuff :3")
 }
 
 interacter.on_fave { |bot, notif|

data/examples/reply.rb

@@ -2,6 +2,6 @@ require 'elephrame'
 
 replier = Elephrame::Bots::Reply.new
 
-replier.run { |bot, mention|
-  bot.reply("@#{mention.account.acct} hey!")
+replier.run { |bot|
+  bot.reply("hey!")
 }

data/lib/elephrame/streaming/streaming.rb

@@ -25,9 +25,11 @@ module Elephrame
 
     ##
     # Replies to the last mention the bot recieved using the mention's
-    # visibility and spoiler with +text+
+    #   visibility and spoiler with +text+
     #
-    # *DOES NOT AUTOMATICALLY INCLUDE @'S*
+    # Automatically includes an @ for the account that mentioned the bot.
+    #   Does not include any other @. See +reply_with_mentions+ if you want
+    #   to automatically include all mentions
     #
     # @param text [String] text to post as a reply
     # @param options [Hash] a hash of arguments to pass to post, overrides
@@ -36,8 +38,29 @@ module Elephrame
     def reply(text, *options)
       options = Hash[*options]
       
-      # maybe also @ everyone from the mention? idk that seems like a bad idea tbh
-      post(text, **@mention_data.merge(options).reject { |k| k == :mentions })
+      post("@#{@mention_data[:account].acct} #{text}",
+           **@mention_data.merge(options).reject { |k|
+             k == :mentions or k == :account
+           })
+    end
+
+    ##
+    # Replies to the last post and tags everyone who was mentioned
+    #  (this function respects #NoBot)
+    #
+    # @param text [String] text to post as a reply
+    # @param options [Hash] arguments to pass to post, overrides settings from
+    #  last mention
+
+    def reply_with_mentions(text, *options)
+      # build up a string of all accounts mentioned in the post
+      #  unless that account is our own, or the tagged account
+      #  has #NoBot
+      mentions = @mention_data[:mentions].collect do |m|
+        "@#{m.acct}" unless m.acct == @username or no_bot? m.id
+      end.join ' '
+      
+      reply("#{mentions.strip} #{text}", *options)
     end
 
     ##
@@ -75,8 +98,9 @@ module Elephrame
         reply_id: mention.id,
         visibility: mention.visibility,
         spoiler: mention.spoiler_text,
+        hide_media: mention.sensitive?,
         mentions: mention.mentions,
-        hide_media: mention.sensitive?
+        account: mention.account
       }
     end
   end
@@ -165,7 +189,7 @@ module Elephrame
     
     def set_help usage
       add_command 'help' do |bot, content, status|
-        bot.reply("@#{status.account.acct} #{usage}")
+        bot.reply("#{usage}")
       end
     end
 

data/lib/elephrame/version.rb

@@ -1,3 +1,3 @@
 module Elephrame
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elephrame
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Zac
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler