discorb 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd489ad4debd6585ee50f7e260288c862b1b655d2dda44af6151398e9b722b01
-  data.tar.gz: b5fd92c939bdbc8456dd0302b1a6d5e362afba2f39bdbe337e03918d30eb6357
+  metadata.gz: c3274a015f4e303bb978379e4eb01a039088ce3139507bccf6e32dbcf19dfe29
+  data.tar.gz: 4f8b8ca01fcbd9e362ff90bdee7880d11769e0c984687be1e7d5774a9da6a8b5
 SHA512:
-  metadata.gz: ebf5a3685316ab02f18ff2d21af0f494c13beac47554968a54b96109eebfa98c38b6e4e0c5f4c1c8e8d8ce2dee70a6424a87782ca75804830e8826da1ce64c43
-  data.tar.gz: dfb9ee552ed4eae349ed6cf99f846f391a1afab96941a181de11a3257d1a9234bb7304baeedd36b29f751374a59492299697856728b1a7779b930dc22e43ff81
+  metadata.gz: 7eb065d83e4fa92ac82bfd70426e48e04aaca4832dcea9890603e04a349998b48f0d39aac1169a047b73014b88517eae05ab9679c1e55e27286e7b411f6454b2
+  data.tar.gz: 77bb4471337fbf056af8a3d3493b84218cb6811745ce28e3a33e4684e72f6806c74045af1a58bf8d7e80532d46cf9fb8caa51587e94c8f96660e5ad9ce10bd6b

data/Changelog.md

@@ -220,3 +220,7 @@ end
 - Add: Add `File.from_string`
 - Fix: Fix `Client#update_presence`
 - Add: Add information in `discorb run -d`
+
+## 0.8.2
+
+Fix: Fix `Client#initialize`

data/lib/discorb/client.rb

@@ -65,13 +65,12 @@ module Discorb
     # @param [Boolean] colorize_log Whether to colorize the log.
     # @param [:debug, :info, :warn, :error, :critical] log_level The log level.
     # @param [Boolean] wait_until_ready Whether to delay event dispatch until ready.
-    # @param [Boolean] fetch_member Whether to fetch member on ready. This may slow down the client.
-    #   Defaultly, it's `false` if {Discorb::Intents#members} is false. Otherwise, it's `true`.
+    # @param [Boolean] fetch_member Whether to fetch member on ready. This may slow down the client. Default to `false`.
     #
     def initialize(
       allowed_mentions: nil, intents: nil, message_caches: 1000,
       log: nil, colorize_log: false, log_level: :info,
-      wait_until_ready: true, fetch_member: nil
+      wait_until_ready: true, fetch_member: false
     )
       @allowed_mentions = allowed_mentions || AllowedMentions.new(everyone: true, roles: true, users: true)
       @intents = (intents or Intents.default)
@@ -94,7 +93,7 @@ module Discorb
       @commands = []
       @bottom_commands = []
       @status = :initialized
-      @fetch_member = fetch_member.nil? ? !(intents&.members) : fetch_member
+      @fetch_member = fetch_member
       set_default_events
     end
 

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/message.rb

@@ -213,6 +213,55 @@ module Discorb
       !@updated_at.nil?
     end
 
+    #
+    # Removes the mentions from the message.
+    #
+    # @param [Boolean] user Whether to clean user mentions.
+    # @param [Boolean] channel Whether to clean channel mentions.
+    # @param [Boolean] role Whether to clean role mentions.
+    # @param [Boolean] emoji Whether to clean emoji.
+    # @param [Boolean] everyone Whether to clean `@everyone` and `@here`.
+    # @param [Boolean] codeblock Whether to clean codeblocks.
+    #
+    # @return [String] The cleaned content of the message.
+    #
+    def clean_content(user: true, channel: true, role: true, emoji: true, everyone: true, codeblock: false)
+      ret = @content.dup
+      ret.gsub!(/<@!?(\d+)>/) do |match|
+        member = guild&.members&.[]($1)
+        member ||= @client.users[$1]
+        member ? "@#{member.name}" : "@Unknown User"
+      end if user
+      ret.gsub!(/<#(\d+)>/) do |match|
+        channel = @client.channels[$1]
+        channel ? "<##{channel.id}>" : "#Unknown Channel"
+      end
+      ret.gsub!(/<@&(\d+)>/) do |match|
+        role = guild&.roles&.[]($1)
+        role ? "@#{role.name}" : "@Unknown Role"
+      end if role
+      ret.gsub!(/<a?:([a-zA-Z0-9_]+):\d+>/) do |match|
+        $1
+      end if emoji
+      ret.gsub!(/@(everyone|here)/, "@\u200b\\1") if everyone
+      unless codeblock
+        codeblocks = ret.split("```", -1)
+        original_codeblocks = @content.scan(/```(.+?)```/m)
+        res = []
+        max = codeblocks.length
+        codeblocks.each_with_index do |codeblock, i|
+          if max % 2 == 0 && i == max - 1 or i.even?
+            res << codeblock
+          else
+            res << original_codeblocks[i / 2]
+          end
+        end
+        res.join("```")
+      else
+        ret
+      end
+    end
+
     #
     # Edit the message.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - sevenc-nanashi
@@ -79,8 +79,6 @@ files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/build_main.yml"
 - ".github/workflows/build_version.yml"
-- ".github/workflows/changelog.rb"
-- ".github/workflows/release_from_changelog.yml"
 - ".gitignore"
 - ".yardopts"
 - Changelog.md

data/.github/workflows/changelog.rb

@@ -1,12 +0,0 @@
-changelog = File.read("./Changelog.md")
-releases = changelog.split("## ")
-releases_hash = releases.map do |release|
-  release_name = "v" + release.split("\n")[0]
-  release_body = release.split("\n")[1..-1].join("\n").strip
-  [release_name, release_body]
-end.to_h
-
-release_version = ENV["GITHUB_REF"].split("/")[-1]
-
-release_body = releases_hash[release_version] || "No release notes for this version"
-puts "::set-output name=release_body::#{release_body.gsub("\n", "\\n")}"

data/.github/workflows/release_from_changelog.yml

@@ -1,39 +0,0 @@
-name: Release from changelog
-
-on:
-  workflow_dispatch:
-  push:
-    tags: 
-      - "v*"
-jobs:
-  main:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.2
-          bundler-cache: true
-      - name: Install dependencies
-        run: |
-          bundle install
-      - name: Get changelog
-        run: |
-          bundle exec ruby .github/workflows/changelog.rb
-        id: get-changelog
-      - name: Build gem
-        run: |
-          bundle exec rake build
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            $(ls -1 pkg/*.gem)
-          body: ${{ steps.get-changelog.outputs.release_body }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}