Merge pull request #1211 from pooza/dev/3.6.12

3.6.12

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,41 @@
+# @link https://tech-blog.rakus.co.jp/entry/20240208/issue_forms
+name: 不具合報告
+description: 不具合報告はこちら。
+labels: ["bug"]
+body:
+  - type: textarea
+    attributes:
+      label: 概要
+      description: 不具合の概要を記載してください。
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 現象
+      description: |
+        不具合の詳細を記載してください。
+        見た目に関係する場合は、スクリーンショット等を貼り付けてください。
+  - type: textarea
+    attributes:
+      label: 期待される動作
+      description: 「現象」が、本来どの様なふるまいであるべきかを記載してください。
+  - type: textarea
+    attributes:
+      label: 再現環境
+  - type: input
+    attributes:
+      label: 発生時刻
+      description: |
+        不具合が発生した日付と時刻を、可能な限り記載してください。
+        ログとの照合を行うため、可能な限り、分単位で正しい時刻を記載してください。
+  - type: textarea
+    attributes:
+      label: 再現手順
+      description: 不具合を再現させる手順を記載してください。
+      value: |
+        1.
+        2.
+        3.
+  - type: textarea
+    attributes:
+      label: 補足

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.0
+          ruby-version: 3.4.1
       - name: apt install
         run: |
           sudo apt update

.rubocop.yml

@@ -19,7 +19,7 @@ AllCops:
     - '**/Rakefile'
     - '**/config.ru'
   NewCops: enable
-  TargetRubyVersion: 3.3
+  TargetRubyVersion: 3.4
 Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 Layout/ArrayAlignment:
@@ -120,6 +120,8 @@ Sequel:
     - app/migration/**/*.rb
 Sequel/ConcurrentIndex:
   Enabled: false
+Sequel/IrreversibleMigration:
+  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/ConditionalAssignment:

.ruby-version

@@ -1 +1 @@
-3.3.4
+3.4.1

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '~>3.3.0'
+ruby '~>3.4.0'
 gem 'feedjira', '~>3.0'
 gem 'ginseng-core', github: 'pooza/ginseng-core', require: 'ginseng'
 gem 'ginseng-fediverse', github: 'pooza/ginseng-fediverse', require: 'ginseng/fediverse'

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/pooza/ginseng-core.git
-  revision: f480c0d282ccd5a941b4dae7bc9625bde58c1e18
+  revision: d88eaf4916bad3ce14a2f9a0cf2d49aea066cb5c
   specs:
-    ginseng-core (1.14.4)
+    ginseng-core (1.14.5)
       activesupport (>= 7.0.7.1)
       addressable (>= 2.8.0)
       bundler (~> 2.0)
@@ -36,15 +36,16 @@ GIT
 
 GIT
   remote: https://github.com/pooza/ginseng-fediverse.git
-  revision: 4e9e62529d2017093d0875595275aded7f83a478
+  revision: 2b30e1481455a0a54607ebcbc3933e84214394f5
   specs:
-    ginseng-fediverse (1.8.16)
+    ginseng-fediverse (1.8.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -54,156 +55,164 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     cgi (0.4.1)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
-    csv (3.3.0)
+    csv (3.3.2)
     daemon-spawn (0.4.2)
-    date (3.3.4)
+    date (3.4.1)
     domain_name (0.6.20240107)
     drb (2.2.1)
     erb (4.0.4)
       cgi (>= 0.3.3)
     et-orbi (1.2.11)
       tzinfo
-    etc (1.4.3)
+    etc (1.4.5)
     facets (3.1.0)
     feedjira (3.2.3)
       loofah (>= 2.3.1, < 3)
       sax-machine (>= 1.0, < 2)
-    fileutils (1.7.2)
+    fileutils (1.7.3)
     find (0.2.0)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httparty (0.22.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    icalendar (2.10.2)
+    icalendar (2.10.3)
       ice_cube (~> 0.16)
+      ostruct
     icalendar-rrule (0.1.7)
       activesupport (>= 5.1)
       icalendar (>= 2.4)
       ice_cube (>= 0.16)
     ice_cube (0.17.0)
-    json (2.7.2)
-    json-schema (5.0.0)
+    json (2.9.1)
+    json-schema (5.1.1)
       addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
-    loofah (2.22.0)
+    logger (1.6.4)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0820)
+    mime-types-data (3.2024.1203)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    net-imap (0.4.15)
+    net-imap (0.5.4)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.0)
-      net-protocol
     netrc (0.11.0)
-    nokogiri (1.16.7)
+    nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.18.1-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.1-x86_64-linux-gnu)
       racc (~> 1.4)
-    optparse (0.5.0)
+    optparse (0.6.0)
+    ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    power_assert (2.0.3)
+    power_assert (2.0.5)
     public_suffix (6.0.1)
     raabro (1.4.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.10.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ricecream (0.2.1)
-    rubocop (1.66.0)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.2)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-sequel (0.3.4)
+    rubocop-sequel (0.3.8)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    rufus-scheduler (3.9.1)
-      fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.1.3)
+    rufus-scheduler (3.9.2)
+      fugit (~> 1.1, >= 1.11.1)
+    sanitize (7.0.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
+      nokogiri (>= 1.16.8)
     sax-machine (1.3.2)
-    securerandom (0.3.1)
-    sequel (5.84.0)
+    securerandom (0.4.1)
+    sequel (5.88.0)
       bigdecimal
-    set (1.1.0)
-    sqlite3 (2.0.4)
+    set (1.1.1)
+    sqlite3 (2.5.0)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.0.4-aarch64-linux-gnu)
-    sqlite3 (2.0.4-x86_64-linux-gnu)
-    syslog (0.1.2)
-    test-unit (3.6.2)
+    sqlite3 (2.5.0-aarch64-linux-gnu)
+    sqlite3 (2.5.0-x86_64-linux-gnu)
+    syslog (0.2.0)
+    test-unit (3.6.7)
       power_assert
-    time (0.3.0)
+    time (0.4.1)
       date
-    timeout (0.4.1)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
     yajl-ruby (1.4.3)
-    zeitwerk (2.6.18)
-    zlib (3.1.1)
+    zeitwerk (2.7.1)
+    zlib (3.2.1)
 
 PLATFORMS
   aarch64-linux
@@ -229,7 +238,7 @@ DEPENDENCIES
   test-unit
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.4.1p0
 
 BUNDLED WITH
-   2.5.18
+   2.6.2

app/lib/tomato_shrieker/source/icalendar_source.rb

@@ -82,7 +82,7 @@ def create_entry(event)
       event.dtend ||= event.dtstart
       start_date = Time.parse(event.dtstart.to_s).getlocal
       end_date = Time.parse(event.dtend.to_s).getlocal
-      return {
+      data = {
         start_date:,
         end_date:,
         is_today: today?(start_date, end_date),
@@ -91,6 +91,9 @@ def create_entry(event)
         location: fedi_sanitize(event.location),
         all_day: event.dtstart.is_a?(Icalendar::Values::Date),
       }
+      # Google Calendarで、終日予定の終了日が1日ずれる。
+      data[:end_date] -= 1.days if data[:all_day] && (data[:start_date] < data[:end_date])
+      return data
     end
 
     def templates

config/application.yaml

@@ -37,7 +37,7 @@ package:
     - [email protected]
   license: MIT
   url: https://github.com/pooza/tomato-shrieker
-  version: 3.6.11
+  version: 3.6.12
 ruby:
   jit: false
 scheduler: