最新develop取得 (#5) (#6)

Co-authored-by: Oneric <oneric@oneric.stub>
Co-authored-by: Floatingghost <hannah@coffee-and-dreams.uk>
Co-authored-by: floatingghost <hannah@coffee-and-dreams.uk>
Co-authored-by: cevado <cevado@tutanota.com>
Co-authored-by: TudbuT <tudbut@tudbut.de>
Co-authored-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Reviewed-on: sliver/akkoma#5
Reviewed-on: sliver/akkoma#6

.woodpecker/build-amd64.yml

@@ -77,6 +77,7 @@ steps:
       - *clean
       - echo "import Config" > config/prod.secret.exs
       - *setup-hex
+      - *mix-clean
       - *tag-build
       - mix deps.get --only prod
       - mix release --path release

CHANGELOG.md

@@ -362,6 +362,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## 2022.08
 
+### Removed
+- Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
+
+## 2022.08
+
 ### Added
 - extended runtime module support, see config cheatsheet
 - quote posting; quotes are limited to public posts

docs/mkdocs.yml

@@ -30,8 +30,8 @@ theme:
 
 extra_css:
   - css/extra.css
-repo_name: 'AkkomaGang/akkoma'
-repo_url: 'https://akkoma.dev/AkkomaGang/akkoma'
+repo_name: 'sliver/akkoma'
+repo_url: 'https://akkoma.dev/sliver/akkoma'
 
 extra:
   repo_icon: gitea

docs/theme/partials/source.html

@@ -38,10 +38,10 @@
 {% endif %}
 
 {% if page and page.url.startswith('backend') %}
-  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma" %}
+  {% set repo_url = "https://akkoma.dev/sliver/akkoma" %}
   {% set repo_name = "AkkomaGang/akkoma" %}
 {% elif page and page.url.startswith('frontend') %}
-  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma-fe" %}
+  {% set repo_url = "https://akkoma.dev/sliver/akkoma-fe" %}
   {% set repo_name = "AkkomaGang/akkoma-fe" %}
 {% else %}
   {% set repo_url = config.repo_url %}

lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex

@@ -180,10 +180,11 @@ defp fix(data) do
     |> fix_tag()
     |> fix_replies()
     |> fix_source()
+    |> Transmogrifier.fix_content_map()
     |> fix_misskey_content()
     |> Transmogrifier.fix_attachments()
     |> Transmogrifier.fix_emoji()
-    |> Transmogrifier.fix_content_map()
+    # |> Transmogrifier.fix_content_map()
     |> fix_content_map_languages()
   end
 

lib/pleroma/web/fallback/redirect_controller.ex

@@ -37,7 +37,7 @@ def redirector_with_meta(conn, params) do
 
     tags = build_tags(conn, params)
     preloads = preload_data(conn, params)
-    title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
+    title = "<title>akkoma.flyerdonut</title>"
 
     response =
       index_content

lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex

@@ -1,6 +1,7 @@
 # Pleroma: A lightweight social networking server
 # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
+# メモ：タイムライン取得系です
 
 defmodule Pleroma.Web.MastodonAPI.TimelineController do
   use Pleroma.Web, :controller
@@ -176,7 +177,7 @@ def bubble(%{assigns: %{user: user}} = conn, params) do
 
       Logger.debug("TimelineController.bubble: fetching activities")
 
-      activities =
+      activities_from_bubble =
         params
         |> Map.put(:type, ["Create"])
         |> Map.put(:blocking_user, user)
@@ -187,6 +188,35 @@ def bubble(%{assigns: %{user: user}} = conn, params) do
 
       Logger.debug("TimelineController.bubble: rendering")
 
+      #ここからホーム取得の追加
+      followed_hashtags =
+        user
+        |> User.followed_hashtags()
+        |> Enum.map(& &1.id)
+
+      params =
+        params
+        |> Map.put(:type, ["Create", "Announce"])
+        |> Map.put(:blocking_user, user)
+        |> Map.put(:muting_user, user)
+        |> Map.put(:reply_filtering_user, user)
+        |> Map.put(:announce_filtering_user, user)
+        |> Map.put(:user, user)
+        |> Map.put(:local_only, params[:local])
+        |> Map.put(:followed_hashtags, followed_hashtags)
+        |> Map.delete(:local)
+
+      %{nickname: nickname} = user
+      Logger.debug("TimelineController.home: #{nickname} - fetching activities")
+
+      activities_from_user_following =
+        [user.ap_id | User.following(user)]
+        |> ActivityPub.fetch_activities(params)
+        |> Enum.reverse()
+
+      #取得結果を結合
+      activities = activities_from_bubble ++ activities_from_user_following
+
       conn
       |> add_link_headers(activities)
       |> render("index.json",

lib/pleroma/web/metadata/providers/open_graph.ex

@@ -107,7 +107,9 @@ defp build_attachments(%{data: %{"attachment" => attachments}}) do
             "image" ->
               [
                 {:meta, [property: "og:image", content: MediaProxy.url(url["href"])], []},
-                {:meta, [property: "og:image:alt", content: attachment["name"]], []}
+                {:meta, [property: "og:image", content: MediaProxy.url(url["href"])], []},
+                # note用のタグを追加
+                {:meta, [property: "note:card", content: "summary_large_image"], []}
                 | acc
               ]
               |> maybe_add_dimensions(url)

lib/pleroma/web/nodeinfo/nodeinfo.ex

@@ -79,7 +79,8 @@ def get_nodeinfo("2.0") do
           local: !Config.restrict_unauthenticated_access?(:timelines, :local),
           bubble: !Config.restrict_unauthenticated_access?(:timelines, :bubble)
         },
-        federatedTimelineAvailable: Config.get([:instance, :federated_timeline_available], true)
+        federatedTimelineAvailable: Config.get([:instance, :federated_timeline_available], true),
+        themeColor: "#ffebf1",
       }
     }
   end

lib/pleroma/web/router.ex

@@ -1,6 +1,7 @@
 # Pleroma: A lightweight social networking server
 # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
+# メモ：ルーターです
 
 defmodule Pleroma.Web.Router do
   use Pleroma.Web, :router

mix.exs

@@ -18,7 +18,7 @@ def project do
       # Docs
       name: "Akkoma",
       homepage_url: "https://akkoma.dev/",
-      source_url: "https://akkoma.dev/AkkomaGang/akkoma",
+      source_url: "https://akkoma.dev/sliver/akkoma",
       docs: [
         source_url_pattern: "https://akkoma.dev/AkkomaGang/akkoma/blob/develop/%{path}#L%{line}",
         logo: "priv/static/logo-512.png",