dispander.rb 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8abef01b13dda9fa294f57b92345c0238b6cd064520d30c9443552ac1dc09679
-  data.tar.gz: 6acd1059efdf0497a642dddb21c3f3644a4bf69f54722c0575ff2e0331ad9a4c
+  metadata.gz: a45dba58a6aa5d443c2291232d5f52c9bab44354323add4c9be14e9cb0668658
+  data.tar.gz: 4153063d6540ecb03dcfeb957c2dc4a154e16c638068b850be70911d4833745f
 SHA512:
-  metadata.gz: 347f8ff590094e4638bda7875e4a96e0277c1f85e4fa7b1724390c45cb5bbe8b7e9c6cd39236f5ee33c6458271480fcbe11819cef57211619c8bad27bf042c11
-  data.tar.gz: ac3426f499d4a63d2fb2a65464eef439a62e94c240d00b81d8e1e5cb4338cf29a03770cdc3fa045d1043841676ec18e539b4dacc940ab2169fa08d38fcdbc6cc
+  metadata.gz: 47a0b093ce682e5a0a724a4713ad1b50a3ead9e2a095ec1ebe2b085119bc8316d58db7639bb5c95c7a3ea8e4f725b96fa59708a4d2d1db83cadc8a6988d9a1a0
+  data.tar.gz: be3b922fb5749554e9e581bf6319cce398131b7870cafb3e0a5060868eb19119894d936d595b3b4524e14b1b100ce2e0917846e1e7dd95a7fb725b9328d8cc00

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.13.0"
+  spec.add_dependency "discorb", "~> 0.16"
 
   # 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 = []
 
@@ -125,5 +125,19 @@ module Dispander
         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.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dispander.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discorb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
 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.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: discorbのBotにメッセージ展開の機能を追加するExtension。