Suffix WIP

Author: aerosol

lib/plausible/ingestion/source.ex

@@ -15,6 +15,11 @@ defmodule Plausible.Ingestion.Source do
                 |> then(&["adwords" | &1])
                 |> MapSet.new()
 
+  @custom_source_suffixes %{
+    "officeapps.live.com" => "Microsoft 365",
+    "wikipedia.org" => "Wikipedia"
+  }
+
   @external_resource "priv/ref_inspector/referers.yml"
   @referers_yaml Application.app_dir(:plausible, "priv/ref_inspector/referers.yml")
 
@@ -84,13 +89,19 @@ defmodule Plausible.Ingestion.Source do
       |> URI.parse()
       |> format_referrer_host()
 
+    downcased_host = String.downcase(host)
+
     # Prefer custom source overrides over RefInspector so subdomain matches win
-    # (e.g. gemini.google.com resolves to Google Gemini, not Google).
-    case from_custom_sources(String.downcase(host)) do
-      name when is_binary(name) ->
+    # (e.g. gemini.google.com resolves to Google Gemini, not Google). Exact host
+    # matches take priority, then suffix families, then RefInspector.
+    cond do
+      name = from_custom_sources(downcased_host) ->
+        name
+
+      name = from_custom_source_suffix(downcased_host) ->
         name
 
-      _ ->
+      true ->
         case RefInspector.parse(referrer).source do
           :unknown -> host
           # Normalize RefInspector names through our aliases (e.g. Twitter to X (Twitter)).
@@ -99,6 +110,12 @@ defmodule Plausible.Ingestion.Source do
     end
   end
 
+  defp from_custom_source_suffix(host) do
+    Enum.find_value(@custom_source_suffixes, fn {suffix, name} ->
+      if host == suffix or String.ends_with?(host, "." <> suffix), do: name
+    end)
+  end
+
   defp tagged_param(request) do
     request.query_params["utm_source"] ||
       request.query_params["source"] ||

lib/plausible_web/plugs/favicon.ex

@@ -51,7 +51,8 @@ defmodule PlausibleWeb.Favicon do
     "DeepSeek" => "deepseek.com",
     "Microsoft Copilot" => "copilot.microsoft.com",
     "Grok" => "grok.com",
-    "X (Twitter)" => "x.com"
+    "X (Twitter)" => "x.com",
+    "Microsoft 365" => "office.com"
   }
 
   def init(_) do

priv/custom_sources.json

@@ -78,172 +78,7 @@
   "twitter": "X (Twitter)",
   "tiktokads": "TikTok",
   "tik.tok": "TikTok",
-  "fo.wikipedia.org":"Wikipedia",
-  "ga.wikipedia.org":"Wikipedia",
-  "el.m.wikipedia.org":"Wikipedia",
-  "eo.m.wikipedia.org":"Wikipedia",
-  "ms.m.wikipedia.org":"Wikipedia",
-  "nl.wikipedia.org":"Wikipedia",
-  "dga.m.wikipedia.org":"Wikipedia",
-  "th.wikipedia.org":"Wikipedia",
-  "oc.wikipedia.org":"Wikipedia",
-  "da.wikipedia.org":"Wikipedia",
-  "pt.m.wikipedia.org":"Wikipedia",
-  "szl.m.wikipedia.org":"Wikipedia",
-  "be-tarask.wikipedia.org":"Wikipedia",
-  "ta.m.wikipedia.org":"Wikipedia",
-  "pa.m.wikipedia.org":"Wikipedia",
-  "mn.wikipedia.org":"Wikipedia",
-  "sv.m.wikipedia.org":"Wikipedia",
-  "sk.wikipedia.org":"Wikipedia",
-  "it.wikipedia.org":"Wikipedia",
-  "el.wikipedia.org":"Wikipedia",
-  "olo.wikipedia.org":"Wikipedia",
-  "hi.m.wikipedia.org":"Wikipedia",
-  "bn.m.wikipedia.org":"Wikipedia",
-  "uz.wikipedia.org":"Wikipedia",
-  "fr.m.wikipedia.org":"Wikipedia",
-  "fa.wikipedia.org":"Wikipedia",
-  "fi.wikipedia.org":"Wikipedia",
-  "arz.m.wikipedia.org":"Wikipedia",
-  "si.m.wikipedia.org":"Wikipedia",
-  "bjn.wikipedia.org":"Wikipedia",
-  "kn.wikipedia.org":"Wikipedia",
-  "is.m.wikipedia.org":"Wikipedia",
-  "nostalgia.wikipedia.org":"Wikipedia",
-  "en.wikipedia.org":"Wikipedia",
-  "nl.m.wikipedia.org":"Wikipedia",
-  "nn.m.wikipedia.org":"Wikipedia",
-  "bs.wikipedia.org":"Wikipedia",
-  "sh.m.wikipedia.org":"Wikipedia",
-  "vi.m.wikipedia.org":"Wikipedia",
-  "ru.wikipedia.org":"Wikipedia",
-  "tr.m.wikipedia.org":"Wikipedia",
-  "he.wikipedia.org":"Wikipedia",
-  "ta.wikipedia.org":"Wikipedia",
-  "es.wikipedia.org":"Wikipedia",
-  "si.wikipedia.org":"Wikipedia",
-  "pl.wikipedia.org":"Wikipedia",
-  "hu.wikipedia.org":"Wikipedia",
-  "lij.m.wikipedia.org":"Wikipedia",
-  "nn.wikipedia.org":"Wikipedia",
-  "ko.m.wikipedia.org":"Wikipedia",
-  "da.m.wikipedia.org":"Wikipedia",
-  "zh.m.wikipedia.org":"Wikipedia",
-  "vec.wikipedia.org":"Wikipedia",
-  "ar.wikipedia.org":"Wikipedia",
-  "bcl.m.wikipedia.org":"Wikipedia",
-  "en.m.wikipedia.org":"Wikipedia",
-  "sw.wikipedia.org":"Wikipedia",
-  "la.m.wikipedia.org":"Wikipedia",
-  "ur.m.wikipedia.org":"Wikipedia",
-  "id.m.wikipedia.org":"Wikipedia",
-  "crh.wikipedia.org":"Wikipedia",
-  "sr.wikipedia.org":"Wikipedia",
-  "sw.m.wikipedia.org":"Wikipedia",
-  "ka.m.wikipedia.org":"Wikipedia",
-  "lt.m.wikipedia.org":"Wikipedia",
-  "fy.wikipedia.org":"Wikipedia",
-  "ro.m.wikipedia.org":"Wikipedia",
-  "hr.wikipedia.org":"Wikipedia",
-  "mn.m.wikipedia.org":"Wikipedia",
-  "pt.wikipedia.org":"Wikipedia",
-  "it.m.wikipedia.org":"Wikipedia",
-  "lv.m.wikipedia.org":"Wikipedia",
-  "fa.m.wikipedia.org":"Wikipedia",
-  "ja.wikipedia.org":"Wikipedia",
-  "lv.wikipedia.org":"Wikipedia",
-  "hu.m.wikipedia.org":"Wikipedia",
-  "de.wikipedia.org":"Wikipedia",
-  "uk.wikipedia.org":"Wikipedia",
-  "ml.wikipedia.org":"Wikipedia",
-  "te.m.wikipedia.org":"Wikipedia",
-  "bg.wikipedia.org":"Wikipedia",
-  "eu.wikipedia.org":"Wikipedia",
-  "arz.wikipedia.org":"Wikipedia",
-  "id.wikipedia.org":"Wikipedia",
-  "mg.m.wikipedia.org":"Wikipedia",
-  "sq.m.wikipedia.org":"Wikipedia",
-  "ca.wikipedia.org":"Wikipedia",
-  "sk.m.wikipedia.org":"Wikipedia",
-  "az.wikipedia.org":"Wikipedia",
-  "ru.m.wikipedia.org":"Wikipedia",
-  "uz.m.wikipedia.org":"Wikipedia",
-  "wuu.wikipedia.org":"Wikipedia",
-  "hy.wikipedia.org":"Wikipedia",
-  "la.wikipedia.org":"Wikipedia",
-  "ca.m.wikipedia.org":"Wikipedia",
-  "ckb.m.wikipedia.org":"Wikipedia",
-  "tt.wikipedia.org":"Wikipedia",
-  "gu.m.wikipedia.org":"Wikipedia",
-  "lrc.wikipedia.org":"Wikipedia",
-  "be-tarask.m.wikipedia.org":"Wikipedia",
-  "no.m.wikipedia.org":"Wikipedia",
-  "simple.m.wikipedia.org":"Wikipedia",
-  "eu.m.wikipedia.org":"Wikipedia",
-  "ne.m.wikipedia.org":"Wikipedia",
-  "sr.m.wikipedia.org":"Wikipedia",
-  "vi.wikipedia.org":"Wikipedia",
-  "lt.wikipedia.org":"Wikipedia",
-  "cs.m.wikipedia.org":"Wikipedia",
-  "hy.m.wikipedia.org":"Wikipedia",
-  "mr.wikipedia.org":"Wikipedia",
-  "sv.wikipedia.org":"Wikipedia",
-  "eo.wikipedia.org":"Wikipedia",
-  "as.m.wikipedia.org":"Wikipedia",
-  "is.wikipedia.org":"Wikipedia",
-  "sh.wikipedia.org":"Wikipedia",
-  "zh-classical.wikipedia.org":"Wikipedia",
-  "nds-nl.m.wikipedia.org":"Wikipedia",
-  "tl.m.wikipedia.org":"Wikipedia",
-  "tr.wikipedia.org":"Wikipedia",
-  "cs.wikipedia.org":"Wikipedia",
-  "uk.m.wikipedia.org":"Wikipedia",
-  "sq.wikipedia.org":"Wikipedia",
-  "et.m.wikipedia.org":"Wikipedia",
-  "hr.m.wikipedia.org":"Wikipedia",
-  "bn.wikipedia.org":"Wikipedia",
-  "sl.wikipedia.org":"Wikipedia",
-  "th.m.wikipedia.org":"Wikipedia",
-  "hi.wikipedia.org":"Wikipedia",
-  "he.m.wikipedia.org":"Wikipedia",
-  "bat-smg.wikipedia.org":"Wikipedia",
-  "ml.m.wikipedia.org":"Wikipedia",
-  "zh.wikipedia.org":"Wikipedia",
-  "fi.m.wikipedia.org":"Wikipedia",
-  "de.m.wikipedia.org":"Wikipedia",
-  "be.wikipedia.org":"Wikipedia",
-  "pl.m.wikipedia.org":"Wikipedia",
-  "simple.wikipedia.org":"Wikipedia",
-  "rw.m.wikipedia.org":"Wikipedia",
-  "no.wikipedia.org":"Wikipedia",
-  "ja.m.wikipedia.org":"Wikipedia",
-  "yi.m.wikipedia.org":"Wikipedia",
-  "ga.m.wikipedia.org":"Wikipedia",
-  "ar.m.wikipedia.org":"Wikipedia",
+  "wikipedia": "Wikipedia",
   "canary.discord.com":"Discord",
-  "sa.m.wikipedia.org":"Wikipedia",
-  "ky.wikipedia.org":"Wikipedia",
-  "es.m.wikipedia.org":"Wikipedia",
-  "new.wikipedia.org":"Wikipedia",
-  "lij.wikipedia.org":"Wikipedia",
-  "zh-yue.wikipedia.org":"Wikipedia",
-  "bg.m.wikipedia.org":"Wikipedia",
-  "bs.m.wikipedia.org":"Wikipedia",
-  "dz.wikipedia.org":"Wikipedia",
-  "kk.m.wikipedia.org":"Wikipedia",
-  "fr.wikipedia.org":"Wikipedia",
-  "qu.wikipedia.org":"Wikipedia",
-  "ka.wikipedia.org":"Wikipedia",
-  "webk.telegram.org":"Telegram",
-  "et.wikipedia.org":"Wikipedia",
-  "ms.wikipedia.org":"Wikipedia",
-  "az.m.wikipedia.org":"Wikipedia",
-  "cy.wikipedia.org":"Wikipedia",
-  "ro.wikipedia.org":"Wikipedia",
-  "mk.wikipedia.org":"Wikipedia",
-  "tl.wikipedia.org":"Wikipedia",
-  "am.wikipedia.org":"Wikipedia",
-  "ko.wikipedia.org":"Wikipedia",
-  "sl.m.wikipedia.org":"Wikipedia"
+  "webk.telegram.org":"Telegram"
 }

priv/ingest_repo/migrations/20260601000001_remap_sources_v3.exs

@@ -39,23 +39,34 @@ defmodule Plausible.IngestRepo.Migrations.RemapSourcesV3 do
     "mstdn.jp" => "Mastodon"
   }
 
+  @suffix_mappings %{
+    "officeapps.live.com" => "Microsoft 365",
+    "wikipedia.org" => "Wikipedia"
+  }
+
   def up do
     {keys, values} = Enum.unzip(@mappings)
 
-    events_sql = """
-      ALTER TABLE events_v2
-      UPDATE referrer_source = transform(lower(referrer_source), {$0:Array(String)}, {$1:Array(String)})
-      WHERE lower(referrer_source) IN {$0:Array(String)}
-    """
+    for table <- ["events_v2", "sessions_v2"] do
+      transform_sql = """
+        ALTER TABLE #{table}
+        UPDATE referrer_source = transform(lower(referrer_source), {$0:Array(String)}, {$1:Array(String)})
+        WHERE lower(referrer_source) IN {$0:Array(String)}
+      """
+
+      execute(fn -> repo().query!(transform_sql, [keys, values]) end)
 
-    sessions_sql = """
-      ALTER TABLE sessions_v2
-      UPDATE referrer_source = transform(lower(referrer_source), {$0:Array(String)}, {$1:Array(String)})
-      WHERE lower(referrer_source) IN {$0:Array(String)}
-    """
+      for {suffix, name} <- @suffix_mappings do
+        suffix_sql = """
+          ALTER TABLE #{table}
+          UPDATE referrer_source = {$0:String}
+          WHERE referrer_source != {$0:String}
+            AND (lower(referrer_source) = {$1:String} OR endsWith(lower(referrer_source), {$2:String}))
+        """
 
-    execute(fn -> repo().query!(events_sql, [keys, values]) end)
-    execute(fn -> repo().query!(sessions_sql, [keys, values]) end)
+        execute(fn -> repo().query!(suffix_sql, [name, suffix, "." <> suffix]) end)
+      end
+    end
   end
 
   def down do

test/plausible/ingestion/acquisition_test.exs

@@ -113,6 +113,7 @@ defmodule Plausible.Ingestion.AcquisitionTest do
     %{referrer_source: "Threads", expected: "Organic Social"},
     %{referrer_source: "Ecosia", expected: "Organic Search"},
     %{referrer_source: "Kagi", expected: "Organic Search"},
+    %{referrer_source: "Microsoft 365", expected: "Referral"},
     %{
       referrer_source: "Google",
       utm_medium: "display",

test/plausible/ingestion/source_test.exs

@@ -100,6 +100,39 @@ defmodule Plausible.Ingestion.SourceTest do
     assert Source.resolve(%{@base_request | referrer: "https://pplx.ai"}) == "Perplexity"
   end
 
+  test "officeapps.live.com and its subdomains are Microsoft 365" do
+    for referrer <- [
+          "https://officeapps.live.com",
+          "https://cac-excel.officeapps.live.com",
+          "https://euc-excel.officeapps.live.com",
+          "https://ukc-word-edit.officeapps.live.com"
+        ] do
+      assert Source.resolve(%{@base_request | referrer: referrer}) == "Microsoft 365"
+    end
+  end
+
+  test "a host that only looks like the officeapps suffix is not Microsoft 365" do
+    assert Source.resolve(%{@base_request | referrer: "https://notofficeapps.live.com"}) ==
+             "notofficeapps.live.com"
+  end
+
+  test "any wikipedia.org subdomain is Wikipedia (including unlisted language editions)" do
+    for referrer <- [
+          "https://wikipedia.org",
+          "https://www.wikipedia.org",
+          "https://en.wikipedia.org",
+          "https://en.m.wikipedia.org",
+          "https://zu.wikipedia.org"
+        ] do
+      assert Source.resolve(%{@base_request | referrer: referrer}) == "Wikipedia"
+    end
+  end
+
+  test "a host that only looks like the wikipedia suffix is not Wikipedia" do
+    assert Source.resolve(%{@base_request | referrer: "https://notwikipedia.org"}) ==
+             "notwikipedia.org"
+  end
+
   test "RefInspector-resolved aliases are normalized (t.co referrer is 'X (Twitter)')" do
     # t.co is a Twitter domain known to RefInspector but not in custom_sources.json,
     # so it exercises the RefInspector branch and canonical mapping ('Twitter' to 'X (Twitter)').

test/plausible_web/controllers/api/external_controller_test.exs

@@ -2359,6 +2359,13 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
       |> assert_source("Kagi")
       |> assert_acquisition_channel("Organic Search")
     end
+
+    test "officeapps.live.com subdomains are Microsoft 365 and Referral", %{site: site} do
+      site
+      |> event_with_referrer("https://cac-excel.officeapps.live.com")
+      |> assert_source("Microsoft 365")
+      |> assert_acquisition_channel("Referral")
+    end
   end
 
   describe "user_id generation" do

test/plausible_web/plugs/favicon_test.exs

@@ -99,7 +99,8 @@ defmodule PlausibleWeb.FaviconTest do
         "Bluesky" => "bsky.app",
         "Mastodon" => "mastodon.social",
         "X (Twitter)" => "x.com",
-        "Kagi" => "kagi.com"
+        "Kagi" => "kagi.com",
+        "Microsoft 365" => "office.com"
       } do
     test "maps custom source #{source} to #{domain} for favicon", %{plug_opts: plug_opts} do
       expect(