Rename StripLocation to StripMetadata for temporal-proofing reasons

CHANGELOG.md

@@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Uploadfilter `Pleroma.Upload.Filter.Exiftool.ReadDescription` returns description values to the FE so they can pre fill the image description field
 
 ## Changed
-- Uploadfilter `Pleroma.Upload.Filter.Exiftool` has been renamed to `Pleroma.Upload.Filter.Exiftool.StripLocation`
+- Uploadfilter `Pleroma.Upload.Filter.Exiftool` has been renamed to `Pleroma.Upload.Filter.Exiftool.StripMetadata`
 
 ## Fixed
 - Issue preventing fetching anything from IPv6-only instances

docs/docs/administration/CLI_tasks/instance.md

@@ -37,7 +37,7 @@ If any of the options are left unspecified, you will be prompted interactively.
 - `--static-dir <path>` - the directory custom public files should be read from (custom emojis, frontend bundle overrides, robots.txt, etc.)
 - `--listen-ip <ip>` - the ip the app should listen to, defaults to 127.0.0.1
 - `--listen-port <port>` - the port the app should listen to, defaults to 4000
-- `--strip-uploads-location <Y|N>` - use ExifTool to strip uploads of sensitive location data
+- `--strip-uploads-metadata <Y|N>` - use ExifTool to strip uploads of sensitive metadata
 - `--read-uploads-description <Y|N>` - use ExifTool to read image descriptions from uploads
 - `--anonymize-uploads <Y|N>` - randomize uploaded filenames
 - `--dedupe-uploads <Y|N>` - store files based on their hash to reduce data storage requirements if duplicates are uploaded with different filenames

docs/docs/configuration/cheatsheet.md

@@ -654,7 +654,7 @@ This filter replaces the declared filename (not the path) of an upload.
 
 * `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used. You can get the original filename extension by using `{extension}`, for example `custom-file-name.{extension}`.
 
-#### Pleroma.Upload.Filter.Exiftool.StripLocation
+#### Pleroma.Upload.Filter.Exiftool.StripMetadata
 
 This filter only strips the GPS and location metadata with Exiftool leaving color profiles and attributes intact.
 

docs/docs/installation/optional/media_graphics_packages.md

@@ -29,5 +29,5 @@ It is required for the following Akkoma features:
 `exiftool` is media files metadata reader/writer.
 
 It is required for the following Akkoma features:
-  * `Pleroma.Upload.Filters.Exiftool.StripLocation` upload filter (related config: `Plaroma.Upload/filters` in `config/config.exs`)
+  * `Pleroma.Upload.Filters.Exiftool.StripMetadata` upload filter (related config: `Plaroma.Upload/filters` in `config/config.exs`)
   * `Pleroma.Upload.Filters.Exiftool.ReadDescription` upload filter (related config: `Plaroma.Upload/filters` in `config/config.exs`)

lib/mix/tasks/pleroma/instance.ex

@@ -35,7 +35,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
           static_dir: :string,
           listen_ip: :string,
           listen_port: :string,
-          strip_uploads_location: :string,
+          strip_uploads_metadata: :string,
           read_uploads_description: :string,
           anonymize_uploads: :string
         ],
@@ -170,7 +170,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
         )
         |> Path.expand()
 
-      {strip_uploads_location_message, strip_uploads_location_default} =
+      {strip_uploads_metadata_message, strip_uploads_metadata_default} =
         if Pleroma.Utils.command_available?("exiftool") do
           {"Do you want to strip location (GPS) data from uploaded images? This requires exiftool, it was detected as installed. (y/n)",
            "y"}
@@ -179,12 +179,12 @@ defmodule Mix.Tasks.Pleroma.Instance do
            "n"}
         end
 
-      strip_uploads_location =
+      strip_uploads_metadata =
         get_option(
           options,
-          :strip_uploads_location,
-          strip_uploads_location_message,
-          strip_uploads_location_default
+          :strip_uploads_metadata,
+          strip_uploads_metadata_message,
+          strip_uploads_metadata_default
         ) === "y"
 
       {read_uploads_description_message, read_uploads_description_default} =
@@ -248,7 +248,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
           listen_port: listen_port,
           upload_filters:
             upload_filters(%{
-              strip_location: strip_uploads_location,
+              strip_metadata: strip_uploads_metadata,
               read_description: read_uploads_description,
               anonymize: anonymize_uploads
             })
@@ -325,8 +325,8 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
   defp upload_filters(filters) when is_map(filters) do
     enabled_filters =
-      if filters.strip_location do
-        [Pleroma.Upload.Filter.Exiftool.StripLocation]
+      if filters.strip_metadata do
+        [Pleroma.Upload.Filter.Exiftool.StripMetadata]
       else
         []
       end

lib/pleroma/application_requirements.ex

@@ -164,7 +164,7 @@ defmodule Pleroma.ApplicationRequirements do
 
   defp check_system_commands!(:ok) do
     filter_commands_statuses = [
-      check_filter(Pleroma.Upload.Filter.Exiftool.StripLocation, "exiftool"),
+      check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),
       check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
       check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),
       check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),

lib/pleroma/config/deprecation_warnings.ex

@@ -28,7 +28,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     if Pleroma.Upload.Filter.Exiftool in filters do
       Logger.warning("""
       !!!DEPRECATION WARNING!!!
-      Your config is using Exiftool as a filter instead of Exiftool.StripLocation. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
+      Your config is using Exiftool as a filter instead of Exiftool.StripMetadata. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
       ```
       config :pleroma, Pleroma.Upload,
@@ -40,14 +40,14 @@ defmodule Pleroma.Config.DeprecationWarnings do
 
       ```
       config :pleroma, Pleroma.Upload,
-        filters: [Pleroma.Upload.Filter.Exiftool.StripLocation]
+        filters: [Pleroma.Upload.Filter.Exiftool.StripMetadata]
       ```
       """)
 
       new_config =
         filters
         |> Enum.map(fn
-          Pleroma.Upload.Filter.Exiftool -> Pleroma.Upload.Filter.Exiftool.StripLocation
+          Pleroma.Upload.Filter.Exiftool -> Pleroma.Upload.Filter.Exiftool.StripMetadata
           filter -> filter
         end)
 

lib/pleroma/upload/filter/exiftool/strip_metadata.ex

@@ -2,7 +2,7 @@
 # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Upload.Filter.Exiftool.StripLocation do
+defmodule Pleroma.Upload.Filter.Exiftool.StripMetadata do
   @moduledoc """
   Strips GPS related EXIF tags and overwrites the file in place.
   Also strips or replaces filesystem metadata e.g., timestamps.

lib/pleroma/web/plugs/o_auth_scopes_plug.ex

@@ -34,9 +34,7 @@ defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
         permissions = Enum.join(missing_scopes, " #{op} ")
 
         error_message =
-          dgettext("errors", "Insufficient permissions: %{permissions}.",
-            permissions: permissions
-          )
+          dgettext("errors", "Insufficient permissions: %{permissions}.", permissions: permissions)
 
         conn
         |> put_resp_content_type("application/json")

lib/pleroma/web/telemetry.ex

@@ -151,41 +151,40 @@ defmodule Pleroma.Web.Telemetry do
     #   phoenix.router_dispatch.stop.duration
     #   pleroma.repo.query.total_time
     #   pleroma.repo.query.queue_time
-    dist_metrics =
-      [
-        distribution("phoenix.endpoint.stop.duration.fdist",
-          event_name: [:phoenix, :endpoint, :stop],
-          measurement: :duration,
-          unit: {:native, :millisecond},
-          reporter_options: [
-            buckets: simple_buckets
-          ]
-        ),
-        distribution("pleroma.repo.query.decode_time.fdist",
-          event_name: [:pleroma, :repo, :query],
-          measurement: :decode_time,
-          unit: {:native, :millisecond},
-          reporter_options: [
-            buckets: simple_buckets_quick
-          ]
-        ),
-        distribution("pleroma.repo.query.query_time.fdist",
-          event_name: [:pleroma, :repo, :query],
-          measurement: :query_time,
-          unit: {:native, :millisecond},
-          reporter_options: [
-            buckets: simple_buckets
-          ]
-        ),
-        distribution("pleroma.repo.query.idle_time.fdist",
-          event_name: [:pleroma, :repo, :query],
-          measurement: :idle_time,
-          unit: {:native, :millisecond},
-          reporter_options: [
-            buckets: simple_buckets
-          ]
-        )
-      ]
+    dist_metrics = [
+      distribution("phoenix.endpoint.stop.duration.fdist",
+        event_name: [:phoenix, :endpoint, :stop],
+        measurement: :duration,
+        unit: {:native, :millisecond},
+        reporter_options: [
+          buckets: simple_buckets
+        ]
+      ),
+      distribution("pleroma.repo.query.decode_time.fdist",
+        event_name: [:pleroma, :repo, :query],
+        measurement: :decode_time,
+        unit: {:native, :millisecond},
+        reporter_options: [
+          buckets: simple_buckets_quick
+        ]
+      ),
+      distribution("pleroma.repo.query.query_time.fdist",
+        event_name: [:pleroma, :repo, :query],
+        measurement: :query_time,
+        unit: {:native, :millisecond},
+        reporter_options: [
+          buckets: simple_buckets
+        ]
+      ),
+      distribution("pleroma.repo.query.idle_time.fdist",
+        event_name: [:pleroma, :repo, :query],
+        measurement: :idle_time,
+        unit: {:native, :millisecond},
+        reporter_options: [
+          buckets: simple_buckets
+        ]
+      )
+    ]
 
     vm_metrics =
       sum_counter_pair("vm.memory.total",

priv/repo/migrations/20220220135625_upload_filter_exiftool_to_exiftool_strip_location.exs

@@ -1,4 +1,4 @@
-defmodule Pleroma.Repo.Migrations.UploadFilterExiftoolToExiftoolStripLocation do
+defmodule Pleroma.Repo.Migrations.UploadFilterExiftoolToExiftoolStripMetadata do
   use Ecto.Migration
 
   alias Pleroma.ConfigDB
@@ -8,14 +8,14 @@ defmodule Pleroma.Repo.Migrations.UploadFilterExiftoolToExiftoolStripLocation do
       ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Upload})
       |> update_filtername(
         Pleroma.Upload.Filter.Exiftool,
-        Pleroma.Upload.Filter.Exiftool.StripLocation
+        Pleroma.Upload.Filter.Exiftool.StripMetadata
       )
 
   def down,
     do:
       ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Upload})
       |> update_filtername(
-        Pleroma.Upload.Filter.Exiftool.StripLocation,
+        Pleroma.Upload.Filter.Exiftool.StripMetadata,
         Pleroma.Upload.Filter.Exiftool
       )
 

test/mix/tasks/pleroma/instance_test.exs

@@ -69,7 +69,7 @@ defmodule Mix.Tasks.Pleroma.InstanceTest do
         "test/uploads",
         "--static-dir",
         "./test/../test/instance/static/",
-        "--strip-uploads-location",
+        "--strip-uploads-metadata",
         "y",
         "--read-uploads-description",
         "y",
@@ -93,8 +93,10 @@ defmodule Mix.Tasks.Pleroma.InstanceTest do
     assert generated_config =~ "password: \"dbpass\""
     assert generated_config =~ "configurable_from_database: true"
     assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]"
+
     assert generated_config =~
-             "filters: [Pleroma.Upload.Filter.Exiftool.StripLocation, Pleroma.Upload.Filter.Exiftool.ReadDescription]"
+             "filters: [Pleroma.Upload.Filter.Exiftool.StripMetadata, Pleroma.Upload.Filter.Exiftool.ReadDescription]"
+
     assert generated_config =~ "base_url: \"https://media.pleroma.social/media\""
     assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql()
     assert File.exists?(Path.expand("./test/instance/static/robots.txt"))

test/pleroma/config/deprecation_warnings_test.exs

@@ -21,7 +21,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
       assert capture_log(fn -> DeprecationWarnings.check_exiftool_filter() end) =~
                """
                !!!DEPRECATION WARNING!!!
-               Your config is using Exiftool as a filter instead of Exiftool.StripLocation. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
+               Your config is using Exiftool as a filter instead of Exiftool.StripMetadata. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
                ```
                config :pleroma, Pleroma.Upload,
@@ -33,19 +33,19 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
 
                ```
                config :pleroma, Pleroma.Upload,
-                 filters: [Pleroma.Upload.Filter.Exiftool.StripLocation]
+                 filters: [Pleroma.Upload.Filter.Exiftool.StripMetadata]
                ```
                """
     end
 
-    test "changes setting to exiftool strip location" do
+    test "changes setting to exiftool strip metadata" do
       clear_config(
         [Pleroma.Upload, :filters],
         [Pleroma.Upload.Filter.Exiftool, Pleroma.Upload.Filter.Exiftool.ReadDescription]
       )
 
       expected_config = [
-        Pleroma.Upload.Filter.Exiftool.StripLocation,
+        Pleroma.Upload.Filter.Exiftool.StripMetadata,
         Pleroma.Upload.Filter.Exiftool.ReadDescription
       ]
 
@@ -58,7 +58,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
       clear_config(
         [Pleroma.Upload, :filters],
         [
-          Pleroma.Upload.Filter.Exiftool.StripLocation,
+          Pleroma.Upload.Filter.Exiftool.StripMetadata,
           Pleroma.Upload.Filter.Exiftool.ReadDescription
         ]
       )

test/pleroma/upload/filter/exiftool/strip_location_test.exs

@@ -2,7 +2,7 @@
 # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Upload.Filter.Exiftool.StripLocationTest do
+defmodule Pleroma.Upload.Filter.Exiftool.StripMetadataTest do
   use Pleroma.DataCase
   alias Pleroma.Upload.Filter
 
@@ -21,7 +21,7 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocationTest do
       tempfile: Path.absname("test/fixtures/DSCN0010_tmp.jpg")
     }
 
-    assert Filter.Exiftool.StripLocation.filter(upload) == {:ok, :filtered}
+    assert Filter.Exiftool.StripMetadata.filter(upload) == {:ok, :filtered}
 
     {exif_original, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010.jpg"])
     {exif_filtered, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010_tmp.jpg"])
@@ -37,6 +37,6 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocationTest do
       content_type: "image/webp"
     }
 
-    assert Filter.Exiftool.StripLocation.filter(upload) == {:ok, :noop}
+    assert Filter.Exiftool.StripMetadata.filter(upload) == {:ok, :noop}
   end
 end

test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs

@@ -12,14 +12,13 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidatorTest do
 
   describe "attachments" do
     test "works with apng" do
-      attachment =
-        %{
-          "mediaType" => "image/apng",
-          "name" => "",
-          "type" => "Document",
-          "url" =>
-            "https://media.misskeyusercontent.com/io/2859c26e-cd43-4550-848b-b6243bc3fe28.apng"
-        }
+      attachment = %{
+        "mediaType" => "image/apng",
+        "name" => "",
+        "type" => "Document",
+        "url" =>
+          "https://media.misskeyusercontent.com/io/2859c26e-cd43-4550-848b-b6243bc3fe28.apng"
+      }
 
       assert {:ok, attachment} =
                AttachmentValidator.cast_and_validate(attachment)

test/support/factory.ex

@@ -559,16 +559,15 @@ defmodule Pleroma.Factory do
     like_activity = attrs[:like_activity] || insert(:like_activity)
     attrs = Map.drop(attrs, [:like_activity])
 
-    data =
-      %{
-        "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
-        "type" => "Undo",
-        "actor" => like_activity.data["actor"],
-        "to" => like_activity.data["to"],
-        "object" => like_activity.data["id"],
-        "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
-        "context" => like_activity.data["context"]
-      }
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+      "type" => "Undo",
+      "actor" => like_activity.data["actor"],
+      "to" => like_activity.data["to"],
+      "object" => like_activity.data["id"],
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+      "context" => like_activity.data["context"]
+    }
 
     %Pleroma.Activity{
       data: data,