projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.4.1' into chores/2.4.1-develop
[akkoma]
/
lib
/
pleroma
/
upload
/
filter
/
dedupe.ex
diff --git
a/lib/pleroma/upload/filter/dedupe.ex
b/lib/pleroma/upload/filter/dedupe.ex
index 14928c355484165dd06f544fc4ce80a7bbf034c1..2bf581b05cccb1a4eb8471fb7029da06af6cce20 100644
(file)
--- a/
lib/pleroma/upload/filter/dedupe.ex
+++ b/
lib/pleroma/upload/filter/dedupe.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload.Filter.Dedupe do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload.Filter.Dedupe do
@@
-17,8
+17,8
@@
defmodule Pleroma.Upload.Filter.Dedupe do
|> Base.encode16(case: :lower)
filename = shasum <> "." <> extension
|> Base.encode16(case: :lower)
filename = shasum <> "." <> extension
- {:ok, %Upload{upload | id: shasum, path: filename}}
+ {:ok,
:filtered,
%Upload{upload | id: shasum, path: filename}}
end
end
- def filter(_), do:
:ok
+ def filter(_), do:
{:ok, :noop}
end
end