Merge branch 'deps/remove-earmark' into 'master'
Remove unneeded Markdown converter (earmark) Closes #172 See merge request framasoft/mobilizon!201
This commit is contained in:
commit
6cb250ffee
@ -115,17 +115,6 @@ defmodule MobilizonWeb.API.Utils do
|
|||||||
|> Formatter.linkify(options)
|
|> Formatter.linkify(options)
|
||||||
end
|
end
|
||||||
|
|
||||||
# @doc """
|
|
||||||
# Formatting text to markdown.
|
|
||||||
# """
|
|
||||||
# def format_input(text, "text/markdown", options) do
|
|
||||||
# text
|
|
||||||
# |> Formatter.mentions_escape(options)
|
|
||||||
# |> Earmark.as_html!()
|
|
||||||
# |> Formatter.linkify(options)
|
|
||||||
# |> Formatter.html_escape("text/html")
|
|
||||||
# end
|
|
||||||
|
|
||||||
def make_report_content_text(nil), do: {:ok, nil}
|
def make_report_content_text(nil), do: {:ok, nil}
|
||||||
|
|
||||||
def make_report_content_text(comment) do
|
def make_report_content_text(comment) do
|
||||||
|
@ -101,12 +101,10 @@ defmodule Mobilizon.Service.Export.Feed do
|
|||||||
defp get_entry(%Event{} = event) do
|
defp get_entry(%Event{} = event) do
|
||||||
description = event.description || ""
|
description = event.description || ""
|
||||||
|
|
||||||
case Earmark.as_html(description) do
|
|
||||||
{:ok, html, []} ->
|
|
||||||
entry =
|
entry =
|
||||||
Entry.new(event.url, event.publish_at || event.inserted_at, event.title)
|
Entry.new(event.url, event.publish_at || event.inserted_at, event.title)
|
||||||
|> Entry.link(event.url, rel: "alternate", type: "text/html")
|
|> Entry.link(event.url, rel: "alternate", type: "text/html")
|
||||||
|> Entry.content({:cdata, html}, type: "html")
|
|> Entry.content({:cdata, description}, type: "html")
|
||||||
|> Entry.published(event.publish_at || event.inserted_at)
|
|> Entry.published(event.publish_at || event.inserted_at)
|
||||||
|
|
||||||
# Add tags
|
# Add tags
|
||||||
@ -116,10 +114,6 @@ defmodule Mobilizon.Service.Export.Feed do
|
|||||||
|> Enum.reduce(entry, fn tag, acc -> Entry.category(acc, tag.slug, label: tag.title) end)
|
|> Enum.reduce(entry, fn tag, acc -> Entry.category(acc, tag.slug, label: tag.title) end)
|
||||||
|
|
||||||
Entry.build(entry)
|
Entry.build(entry)
|
||||||
|
|
||||||
{:error, _html, error_messages} ->
|
|
||||||
Logger.error("Unable to produce HTML for Markdown", details: inspect(error_messages))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
@spec fetch_events_from_token(String.t()) :: String.t()
|
@spec fetch_events_from_token(String.t()) :: String.t()
|
||||||
|
1
mix.exs
1
mix.exs
@ -88,7 +88,6 @@ defmodule Mobilizon.Mixfile do
|
|||||||
{:plug_cowboy, "~> 2.0"},
|
{:plug_cowboy, "~> 2.0"},
|
||||||
{:atomex, "0.3.0"},
|
{:atomex, "0.3.0"},
|
||||||
{:cachex, "~> 3.1"},
|
{:cachex, "~> 3.1"},
|
||||||
{:earmark, "~> 1.4.0"},
|
|
||||||
{:geohax, "~> 0.3.0"},
|
{:geohax, "~> 0.3.0"},
|
||||||
{:mogrify, "~> 0.7.2"},
|
{:mogrify, "~> 0.7.2"},
|
||||||
{:auto_linker,
|
{:auto_linker,
|
||||||
|
Loading…
Reference in New Issue
Block a user