Merge pull request #3756 from pooza/dev/4.33.0

4.33.0
pooza · Sep 15, 2024 · d065102 · d065102
2 parents 27d9916 + a7e4e9d
commit d065102
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 379 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -44,9 +44,9 @@ 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)
 
 GIT
   remote: https://github.com/pooza/ginseng-postgres.git
@@ -172,10 +172,10 @@ GEM
     etc (1.4.3)
     eventmachine (1.2.7)
     facets (3.1.0)
-    faraday (2.10.1)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
       logger
-    faraday-net_http (3.1.1)
+    faraday-net_http (3.3.0)
       net-http
     fastimage (2.3.1)
     ffi (1.17.0)
@@ -199,10 +199,10 @@ GEM
     json (2.7.2)
     json-schema (5.0.0)
       addressable (~> 2.8)
-    jwt (2.8.2)
+    jwt (2.9.0)
       base64
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -214,7 +214,7 @@ GEM
     marcel (1.0.4)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0820)
+    mime-types-data (3.2024.0903)
     mini_magick (5.0.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
@@ -224,11 +224,11 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    mustermann (3.0.2)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     net-http (0.4.1)
       uri
-    net-imap (0.4.14)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
@@ -262,10 +262,10 @@ GEM
       omniauth (~> 2.0)
     optparse (0.5.0)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.7)
+    pg (1.5.8)
     power_assert (2.0.3)
     public_suffix (6.0.1)
     puma (6.4.2)
@@ -301,29 +301,27 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.7)
     ricecream (0.2.1)
     rspotify (2.12.2)
       addressable (~> 2.8.0)
       omniauth-oauth2 (>= 1.6)
       rest-client (~> 2.0.2)
     rss (0.3.1)
       rexml
-    rubocop (1.65.1)
+    rubocop (1.66.1)
       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)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.1)
+    rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.21.1)
@@ -335,15 +333,15 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rufus-scheduler (3.9.1)
-      fugit (~> 1.1, >= 1.1.6)
+    rufus-scheduler (3.9.2)
+      fugit (~> 1.1, >= 1.11.1)
     sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     securerandom (0.3.1)
-    sequel (5.83.1)
+    sequel (5.84.0)
       bigdecimal
     set (1.1.0)
     sidekiq (7.2.4)
@@ -364,27 +362,27 @@ GEM
     slim (5.2.1)
       temple (~> 0.10.0)
       tilt (>= 2.1.0)
-    slim_lint (0.27.0)
+    slim_lint (0.29.0)
+      rexml (~> 3.2)
       rubocop (>= 1.0, < 2.0)
       slim (>= 3.0, < 6.0)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    strscan (3.1.0)
     syslog (0.1.2)
     temple (0.10.3)
     test-unit (3.6.2)
       power_assert
     tilt (2.1.0)
-    time (0.3.0)
+    time (0.4.0)
       date
     timecop (0.9.10)
     timeout (0.4.1)
     trollop (2.9.10)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
     useragent (0.16.10)
     version_gem (1.1.4)
     webrick (1.8.1)
@@ -394,7 +392,7 @@ GEM
     yajl-ruby (1.4.3)
     yamllint (0.0.9)
       trollop (~> 2)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
     zlib (3.1.1)
 
 PLATFORMS
@@ -437,4 +435,4 @@ RUBY VERSION
    ruby 3.3.4p94
 
 BUNDLED WITH
-   2.5.17
+   2.5.18
diff --git a/README.md b/README.md
@@ -35,7 +35,6 @@
 また、
 
 - アニメ視聴記録サービス[Annict](https://annict.com/)から視聴記録を取得し、投稿する。
-- ローカル投稿を[Nextcloud](https://nextcloud.com/)等、各種外部サービスに保存。
 - ブックマークされた公開投稿を、[Lemmy](https://join.lemmy.ml/)に転送。
 - 平易なPOSTで投稿を行えるwebhook。（Slack Incoming Webhook下位互換）
 - ハッシュタグのRSSフィード。

diff --git a/app/lib/mulukhiya/contract/nextcloud_clipping_command_contract.rb b/app/lib/mulukhiya/contract/nextcloud_clipping_command_contract.rb
diff --git a/app/lib/mulukhiya/contract/user_config_command_contract.rb b/app/lib/mulukhiya/contract/user_config_command_contract.rb
@@ -15,11 +15,6 @@ class UserConfigCommandContract < Contract
         optional(:password).maybe(:string)
         optional(:community).maybe(:integer).value(gt?: 0)
       end
-      required(:nextcloud).maybe(:hash).schema do
-        optional(:url).maybe(:string)
-        optional(:user).maybe(:string)
-        optional(:password).maybe(:string)
-      end
       required(:notify).maybe(:hash).schema do
         optional(:verbose).maybe(:bool)
       end
@@ -43,7 +38,6 @@ def call(values)
       values['notify'] ||= {}
       values['annict'] ||= {}
       values['lemmy'] ||= {}
-      values['nextcloud'] ||= {}
       values['tagging'] ||= {}
       values['tagging']['user_tags'] ||= []
       values['tagging']['tags'] ||= {}

diff --git a/app/lib/mulukhiya/controller_methods.rb b/app/lib/mulukhiya/controller_methods.rb
@@ -37,10 +37,6 @@ def lemmy?
         return Handler.search(/lemmy/).present?
       end
 
-      def nextcloud?
-        return Handler.search(/nextcloud/).present?
-      end
-
       def poipiku?
         return Handler.search(/poipiku/).present?
       end

diff --git a/app/lib/mulukhiya/handler/nextcloud_bookmark_handler.rb b/app/lib/mulukhiya/handler/nextcloud_bookmark_handler.rb
diff --git a/app/lib/mulukhiya/handler/nextcloud_clipping_command_handler.rb b/app/lib/mulukhiya/handler/nextcloud_clipping_command_handler.rb
diff --git a/app/lib/mulukhiya/model/account_methods.rb b/app/lib/mulukhiya/model/account_methods.rb
@@ -59,20 +59,6 @@ def lemmy
       return nil
     end
 
-    def nextcloud
-      return nil unless [:url, :user, :password].all? {|k| user_config["/nextcloud/#{k}"]}
-      @nextcloud ||= NextcloudClipper.new(
-        url: user_config['/nextcloud/url'],
-        user: user_config['/nextcloud/user'],
-        password: user_config['/nextcloud/password'],
-        prefix: user_config['/nextcloud/prefix'],
-      )
-      return @nextcloud
-    rescue => e
-      e.log(acct: acct.to_s)
-      return nil
-    end
-
     def annict
       return nil unless [:token].all? {|k| user_config["/annict/#{k}"]}
       @annict ||= AnnictService.new(user_config['/annict/token'], guest: bot?)

diff --git a/app/lib/mulukhiya/service/annict_service.rb b/app/lib/mulukhiya/service/annict_service.rb
@@ -24,7 +24,7 @@ def viewers_works?
     def activities(&block)
       return enum_for(__method__) unless block
       query(:activity).dig('data', 'viewer', 'activities', 'edges')
-        .filter_map {|activity| activity['node']}
+        .filter_map {|activity| activity['item']}
         .select {|node| node['__typename'].present?}
         .select {|node| node['createdAt'].present?}
         .each(&block)

diff --git a/app/lib/mulukhiya/service/nextcloud_clipper.rb b/app/lib/mulukhiya/service/nextcloud_clipper.rb
diff --git a/app/lib/mulukhiya/worker/nextcloud_clipping_worker.rb b/app/lib/mulukhiya/worker/nextcloud_clipping_worker.rb
diff --git a/app/query/annict/activity.graphql b/app/query/annict/activity.graphql
@@ -6,7 +6,7 @@ query {
     avatarUrl
     activities(orderBy: { field: CREATED_AT, direction: DESC }, first: 50) {
       edges {
-        node {
+        item {
           __typename
           ... on Record {
             annictId