dispander.rb 0.3.4 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b83ea288bf0783e5c2d6dc41c9f74d78729e0afb413c31a4aac5d4b7ab487bc
-  data.tar.gz: 50f425553cf616d0a0226e8312aacc341b8a1cd8fee99ecf4afae0d3c2908870
+  metadata.gz: 3c458f8fd4e1bb7cf7a16abe9472662cf5a898eea94758b8f0ad2a925a2d2f50
+  data.tar.gz: b3f6d59f99ab4286bb6e69972d552588b6d786251451fcc9982a5150c2c81ca3
 SHA512:
-  metadata.gz: 9928cf0a8646aaa79d59356a7cdd7a500bcc946d55add45b08f2a8b443ff66b03cc35dbf25cd47f0eef7b57fb4a4793d709b78f8a3353551087d702caa5948d0
-  data.tar.gz: 0eff46428545d26d5c62399ecadad877ac8d9fd83b49b380227c1e7a6f5c0e71a078a3af8e9d8cc2ee9b3ad834c8761b64ed379da8ceb6d4a12a29ae5fa98a90
+  metadata.gz: 2a6c97d1457cdc23931e2c4831c11526796b124cc911c3a14fd7c11b1da55db7102722a53086a76c2947780cb92e77aad456c0296c9d78b1940646dd6c0d049e
+  data.tar.gz: bab35466c02227b52c026601904fefffa513841591792ec1797fbe998dde8401f730fbe01eed3981b95e3ff8e690687997d4f804f90c4c787bf4c21ec66c6939

data/README.en.md

@@ -74,6 +74,19 @@ Set emoji to `Dispander#delete_emoji`, or specify it in `Client#load_extension`.
 client.load_extension(Dispander::Core, delete_emoji: Discorb::UnicodeEmoji["x"])
 ```
 
+## Change the condition to expand
+
+Override `Dispander#should_expand?`.
+
+```ruby
+dispander = Dispander::Core.new(client)
+
+def dispander.should_expand?(base_message, ids)
+  ENV["ALLOWED_GUILDS"].split(",").include?(ids[0])
+end
+
+client.load_extension(dispander)
+```
 
 ## License
 

data/README.md

@@ -1,13 +1,13 @@
 # dispander.rb
 
-discorbで出来たBotにメッセージ展開の機能を追加するExtension。
+discorb で出来た Bot にメッセージ展開の機能を追加する Extension。
 ![画像](https://user-images.githubusercontent.com/59691627/131650571-ec50bf35-c971-4aeb-9a58-8fbf9b3e759b.png)
 
-[DiscordBotPortalJP/dispander](https://github.com/DiscordBotPortalJP/dispander) のRuby版。
+[DiscordBotPortalJP/dispander](https://github.com/DiscordBotPortalJP/dispander) の Ruby 版。
 
 ## インストール
 
-Gemfileに以下を追記し...
+Gemfile に以下を追記し...
 
 ```ruby
 gem 'dispander'
@@ -23,7 +23,7 @@ gem 'dispander'
 
 ## 使い方
 
-### Extensionとして読み込む
+### Extension として読み込む
 
 ```ruby
 require "discorb"
@@ -73,6 +73,19 @@ client.run ENV["DISCORD_BOT_TOKEN"]
 client.load_extension(Dispander::Core, delete_emoji: Discorb::UnicodeEmoji["x"])
 ```
 
+### 展開条件を変更する
+
+`Dispander#should_expand?`をオーバーライドしてください。
+
+```ruby
+dispander = Dispander::Core.new(client)
+
+def dispander.should_expand?(base_message, ids)
+  ENV["ALLOWED_GUILDS"].split(",").include?(ids[0])
+end
+
+client.load_extension(dispander)
+```
 
 ## ライセンス
 

data/dispander.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "discorb", "~> 0.15"
+  spec.add_dependency "discorb", "~> 0.19"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/examples/custom_condition.rb

@@ -0,0 +1,18 @@
+require "discorb"
+require "dispander"
+
+client = Discorb::Client.new
+
+client.once :standby do
+  puts "Logged in as #{client.user}"
+end
+
+dispander = Dispander::Core.new(client)
+
+def dispander.should_expand?(base_message, ids)
+  ENV["ALLOWED_GUILDS"].split(",").include?(ids[0])
+end
+
+client.load_extension(dispander)
+
+client.run ENV["DISCORD_BOT_TOKEN"]

data/lib/dispander/extension.rb

@@ -4,7 +4,7 @@ module Dispander
   class Core
     include Discorb::Extension
 
-    @@discord_url_pattern = /(?!<)https:\/\/(ptb.|canary.)?discord(app)?.com\/channels\/(?<guild>[0-9]{18,})\/(?<channel>[0-9]{18,})\/(?<message>[0-9]{18,})(?!>)/
+    @@discord_url_pattern = /(?!<)https:\/\/(ptb.|canary.)?discord(app)?.com\/channels\/(?<guild>[0-9]{17,})\/(?<channel>[0-9]{17,})\/(?<message>[0-9]{17,})(?!>)/
 
     def initialize(client, delete_emoji: Discorb::UnicodeEmoji["wastebasket"])
       @delete_emoji = delete_emoji
@@ -35,7 +35,7 @@ module Dispander
       all_sent_messages = []
       base_message.content.scan(@@discord_url_pattern).each do |match|
         guild_id, channel_id, message_id = *match
-        next unless base_message.guild.id == guild_id
+        next unless should_expand?(base_message, [guild_id, channel_id, message_id])
 
         embeds = []
 
@@ -122,8 +122,22 @@ module Dispander
       return unless author_id == event.user_id || operator_id == event.user_id
 
       sent_message_ids.split(",").each do |sent_message_id|
-        event.channel.delete_message!(sent_message_id).wait
+        event.channel.delete_message(sent_message_id).wait
       end
     end
+
+    #
+    # メッセージを展開するかどうか。
+    # デフォルトでは同じサーバーのみ展開されます。
+    # このメソッドをオーバーライドすることにより、条件を変更することができます。
+    #
+    # @params [Discorb::Message] base_message 展開するメッセージ。
+    # @params [Array<String>] match 展開するメッセージのID。`[guild_id, channel_id, message_id]`
+    #
+    # @return [Boolean] 展開する場合は `true`、展開しない場合は `false`。
+    #
+    def should_expand?(base_message, ids)
+      base_message.guild.id == ids[0]
+    end
   end
 end

data/lib/dispander/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dispander
-  VERSION = "0.3.4"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dispander.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.2
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discorb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.19'
 description:
 email:
 - sevenc-nanashi@sevenbot.jp
@@ -40,10 +40,11 @@ files:
 - bin/console
 - bin/setup
 - dispander.gemspec
+- examples/custom_condition.rb
+- examples/normal.rb
 - lib/dispander.rb
 - lib/dispander/extension.rb
 - lib/dispander/version.rb
-- samplebot.rb
 homepage: https://github.com/DiscordBotPortalJP/dispander.rb
 licenses:
 - MIT
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: discorbのBotにメッセージ展開の機能を追加するExtension。