AkkomaGang/akkoma
AkkomaGang/akkoma
16
67
Fork 103
Code Issues 169 Pull requests 12 Projects 2 Releases 19 Packages Wiki Activity

Merge pull request 'fix some elixir 1.18 deprecation warnings' (#930) from Oneric/akkoma:build_deprecation-warnings into develop
All checks were successful
ci/woodpecker/push/lint Pipeline was successful
Details
ci/woodpecker/push/test/2 Pipeline was successful
Details
ci/woodpecker/push/test/1 Pipeline was successful
Details
ci/woodpecker/push/build-arm64 Pipeline was successful
Details
ci/woodpecker/push/build-amd64 Pipeline was successful
Details
ci/woodpecker/push/docs Pipeline was successful
Details

Browse source 
Reviewed-on: #930
This commit is contained in:
Oneric 2025-05-16 09:39:24 +00:00
commit 3791b695f4
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/config_db.ex
View file

@ -303,7 +303,9 @@ def to_elixir_types(%{"tuple" => [":partial_chain", entity]}) do
end
def to_elixir_types(%{"tuple" => entity}) do
Enum.reduce(entity, {}, &Tuple.append(&2, to_elixir_types(&1)))
entity
|> Enum.map(&to_elixir_types(&1))
|> List.to_tuple()
end
def to_elixir_types(entity) when is_map(entity) do

20
lib/pleroma/web/templates/email/digest.html.eex
View file

@ -231,8 +231,8 @@
</div>
<%= for %{data: mention, object: object, from: from} <- @mentions do %>
<%# mention START %>
<%# user card START %>
<%!-- mention START --%>
<%!-- user card START --%>
<div style="background-color:transparent;">
<div class="block-grid mixed-two-up no-stack"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -291,7 +291,7 @@
</div>
</div>
</div>
<%# user card END %>
<%!-- user card END --%>
<div style="background-color:transparent;">
<div class="block-grid"
@ -333,12 +333,12 @@
</div>
</div>
</div>
<%# mention END %>
<%!-- mention END --%>
<% end %>
<%= if @followers != [] do %>
<%# new followers header START %>
<%!-- new followers header START --%>
<div style="background-color:transparent;">
<div class="block-grid"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -397,10 +397,10 @@
</div>
</div>
</div>
<%# new followers header END %>
<%!-- new followers header END --%>
<%= for %{data: follow, from: from} <- @followers do %>
<%# user card START %>
<%!-- user card START --%>
<div style="background-color:transparent;">
<div class="block-grid mixed-two-up no-stack"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -459,13 +459,13 @@
</div>
</div>
</div>
<%# user card END %>
<%!-- user card END --%>
<% end %>
<% end %>
<%# divider start %>
<%!-- divider start --%>
<div style="background-color:transparent;">
<div class="block-grid"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -514,7 +514,7 @@
</div>
</div>
<%# divider end %>
<%!-- divider end --%>
<div style="background-color:transparent;">

10
lib/pleroma/web/templates/email/new_users_digest.html.eex
View file

@ -1,5 +1,5 @@
<%= for {user, total_statuses, latest_status} <- @users_and_statuses do %>
<%# user card START %>
<%!-- user card START --%>
<div style="background-color:transparent;">
<div class="block-grid mixed-two-up no-stack"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -60,7 +60,7 @@
</div>
</div>
</div>
<%# user card END %>
<%!-- user card END --%>
<%= if latest_status do %>
<div style="background-color:transparent;">
@ -104,7 +104,7 @@
</div>
</div>
<% end %>
<%# divider start %>
<%!-- divider start --%>
<div style="background-color:transparent;">
<div class="block-grid"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -153,6 +153,6 @@
</div>
</div>
<%# divider end %>
<%# user card END %>
<%!-- divider end --%>
<%!-- user card END --%>
<% end %>

4
lib/pleroma/web/templates/layout/email_styled.html.eex
View file

@ -111,7 +111,7 @@
<td style="word-break: break-word; vertical-align: top;" valign="top">
<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color:<%= @styling.background_color %>"><![endif]-->
<%# header %>
<%!-- header --%>
<div style="background-color:transparent;">
<div class="block-grid"
style="Margin: 0 auto; min-width: 320px; max-width: 590px; overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; background-color: <%= @styling.content_background_color%>;">
@ -145,7 +145,7 @@
</div>
<%# title %>
<%!-- title --%>
<%= if @title do %>
<div style="background-color:transparent;">
<div class="block-grid"

2
lib/pleroma/web/templates/o_auth/o_auth/_scopes.html.eex
View file

@ -2,7 +2,7 @@
<%= label @form, :scope, Gettext.dpgettext("static_pages", "oauth scopes message", "The following permissions will be granted") %>
<div class="scopes">
<%= for scope <- @available_scopes do %>
<%# Note: using hidden input with `unchecked_value` in order to distinguish user's empty selection from `scope` param being omitted %>
<%!-- Note: using hidden input with `unchecked_value` in order to distinguish user's empty selection from `scope` param being omitted --%>
<%= if scope in @scopes do %>
<div class="scope">
<%= checkbox @form, :"scope_#{scope}", value: scope in @scopes && scope, checked_value: scope, unchecked_value: "", name: "authorization[scope][]" %>