udata 10.6.1.dev36082__py2.py3-none-any.whl → 10.6.1.dev36098__py2.py3-none-any.whl

udata/api/fields.py

@@ -27,7 +27,6 @@ from flask_restx.fields import StringMixin as StringMixin
 from flask_restx.fields import Url as Url
 from flask_restx.fields import Wildcard as Wildcard
 
-from udata.uris import endpoint_for
 from udata.utils import multi_to_dict
 
 log = logging.getLogger(__name__)
@@ -52,22 +51,6 @@ class Markdown(String):
     __schema_format__ = "markdown"
 
 
-class UrlFor(String):
-    def __init__(self, endpoint, mapper=None, **kwargs):
-        super(UrlFor, self).__init__(**kwargs)
-        self.endpoint = endpoint
-        self.fallback_endpoint = kwargs.pop("fallback_endpoint", None)
-        self.mapper = mapper or self.default_mapper
-
-    def default_mapper(self, obj):
-        return {"id": str(obj.id)}
-
-    def output(self, key, obj, **kwargs):
-        return endpoint_for(
-            self.endpoint, self.fallback_endpoint, _external=True, **self.mapper(obj)
-        )
-
-
 class Permission(Boolean):
     def __init__(self, mapper=None, **kwargs):
         super(Permission, self).__init__(**kwargs)

udata/auth/views.py

@@ -1,9 +1,7 @@
-from flask import current_app, flash, redirect, url_for
+from flask import current_app, redirect, url_for
 from flask_login import current_user, login_required
 from flask_security.utils import (
     check_and_get_token_status,
-    do_flash,
-    get_message,
     get_within_delta,
     hash_data,
     login_user,
@@ -26,7 +24,7 @@ from flask_security.views import (
 from werkzeug.local import LocalProxy
 
 from udata.i18n import lazy_gettext as _
-from udata.uris import endpoint_for
+from udata.uris import homepage_url
 
 from .forms import ChangeEmailForm
 
@@ -75,19 +73,20 @@ def confirm_change_email_token_status(token):
 def confirm_change_email(token):
     expired, invalid, user, new_email = confirm_change_email_token_status(token)
 
-    if not user or invalid:
-        invalid = True
-        do_flash(*get_message("INVALID_CONFIRMATION_TOKEN"))
+    flash = None
+    flash_data = None
     if expired:
         send_change_email_confirmation_instructions(user, new_email)
-        do_flash(
-            _(
-                "You did not confirm your change of email within {email_within}. New instructions to confirm your change of email have been sent to {new_email}."
-            ).format(email_within=_security.confirm_email_within, new_email=new_email),
-            "error",
-        )
-    if invalid or expired:
-        return redirect(endpoint_for("site.home", "admin.index"))
+        flash = "change_email_expired"
+        flash_data = {
+            "email_within": _security.confirm_email_within,
+            "new_email": new_email,
+        }
+    elif not user or invalid:
+        flash = "change_email_invalid"
+
+    if flash:
+        return redirect(homepage_url(flash=flash, flash_data=flash_data))
 
     if user != current_user:
         logout_user()
@@ -95,10 +94,8 @@ def confirm_change_email(token):
 
     user.email = new_email
     _datastore.put(user)
-    msg = (_("Thank you. Your change of email has been confirmed."), "success")
 
-    do_flash(*msg)
-    return redirect(endpoint_for("site.home", "admin.index"))
+    return redirect(homepage_url(flash="change_email_confirmed"))
 
 
 @login_required
@@ -110,13 +107,14 @@ def change_email():
     if form.validate_on_submit():
         new_email = form.new_email.data
         send_change_email_confirmation_instructions(current_user, new_email)
-        flash(
-            _(
-                "Thank you. Confirmation instructions for changing your email have been sent to {new_email}."
-            ).format(new_email=new_email),
-            "success",
+        return redirect(
+            homepage_url(
+                flash="change_email",
+                flash_data={
+                    "email": new_email,
+                },
+            )
         )
-        return redirect(endpoint_for("site.home", "admin.index"))
 
     return _security.render_template("security/change_email.html", change_email_form=form)
 

udata/core/activity/api.py

@@ -37,7 +37,7 @@ activity_fields = api.model(
             required=True,
         ),
         "related_to_url": fields.String(
-            attribute="related_to.display_url",
+            attribute=lambda o: o.related_to.url_for(),
             description="The activity target model",
             required=True,
         ),

udata/core/dataservices/api.py

@@ -72,10 +72,10 @@ class DataservicesAtomFeedAPI(API):
             author_uri = None
             if dataservice.organization:
                 author_name = dataservice.organization.name
-                author_uri = dataservice.organization.external_url
+                author_uri = dataservice.organization.url_for()
             elif dataservice.owner:
                 author_name = dataservice.owner.fullname
-                author_uri = dataservice.owner.external_url
+                author_uri = dataservice.owner.url_for()
             feed.add_item(
                 dataservice.title,
                 unique_id=dataservice.id,
@@ -83,7 +83,7 @@ class DataservicesAtomFeedAPI(API):
                 content=md(dataservice.description),
                 author_name=author_name,
                 author_link=author_uri,
-                link=dataservice.url_for(external=True),
+                link=dataservice.url_for(),
                 updateddate=dataservice.metadata_modified_at,
                 pubdate=dataservice.created_at,
             )

udata/core/dataservices/models.py

@@ -17,13 +17,14 @@ from udata.core.dataservices.constants import (
     DATASERVICE_FORMATS,
 )
 from udata.core.dataset.models import Dataset
+from udata.core.linkable import Linkable
 from udata.core.metrics.helpers import get_stock_metrics
 from udata.core.metrics.models import WithMetrics
 from udata.core.owned import Owned, OwnedQuerySet
 from udata.i18n import lazy_gettext as _
 from udata.models import Discussion, Follow, db
 from udata.mongo.errors import FieldValidationError
-from udata.uris import endpoint_for
+from udata.uris import cdata_url
 
 # "frequency"
 # "harvest"
@@ -138,7 +139,7 @@ def check_only_one_condition_per_role(access_audiences, **_kwargs):
         {"key": "views", "value": "metrics.views"},
     ],
 )
-class Dataservice(Auditable, WithMetrics, Owned, db.Document):
+class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
     meta = {
         "indexes": [
             "$title",
@@ -273,18 +274,17 @@ class Dataservice(Auditable, WithMetrics, Owned, db.Document):
         auditable=False,
     )
 
-    def url_for(self, *args, **kwargs):
-        return endpoint_for(
-            "dataservices.show", "api.dataservice", dataservice=self, *args, **kwargs
-        )
-
     @function_field(description="Link to the API endpoint for this dataservice")
-    def self_api_url(self):
-        return endpoint_for("api.dataservice", dataservice=self, _external=True)
+    def self_api_url(self, **kwargs):
+        return url_for(
+            "api.dataservice",
+            dataservice=self._link_id(**kwargs),
+            **self._self_api_url_kwargs(**kwargs),
+        )
 
     @function_field(description="Link to the udata web page for this dataservice", show_as_ref=True)
-    def self_web_url(self):
-        return endpoint_for("dataservices.show", dataservice=self, _external=True)
+    def self_web_url(self, **kwargs):
+        return cdata_url(f"/dataservices/{self._link_id(**kwargs)}/", **kwargs)
 
     __metrics_keys__ = [
         "discussions",

udata/core/dataservices/rdf.py

@@ -20,7 +20,6 @@ from udata.rdf import (
     themes_from_rdf,
     url_from_rdf,
 )
-from udata.uris import endpoint_for
 
 
 def dataservice_from_rdf(
@@ -102,14 +101,7 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     if dataservice.harvest and dataservice.harvest.uri:
         id = URIRef(dataservice.harvest.uri)
     elif dataservice.id:
-        id = URIRef(
-            endpoint_for(
-                "dataservices.show_redirect",
-                "api.dataservice",
-                dataservice=dataservice.id,
-                _external=True,
-            )
-        )
+        id = URIRef(dataservice.url_for(_useId=True))
     else:
         # Should not happen in production. Some test only
         # `build()` a dataset without saving it to the DB.
@@ -137,14 +129,7 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     elif dataservice.id:
         d.set(
             DCAT.landingPage,
-            URIRef(
-                endpoint_for(
-                    "dataservices.show_redirect",
-                    "api.dataservice",
-                    dataservice=dataservice.id,
-                    _external=True,
-                )
-            ),
+            URIRef(dataservice.url_for()),
         )
 
     if dataservice.machine_documentation_url:
@@ -183,7 +168,7 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
         pass
     else:
         for dataset in dataservice.datasets:
-            d.add(DCAT.servesDataset, dataset_to_graph_id(dataset))
+            d.add(DCAT.servesDataset, dataset_to_graph_id(dataset.fetch()))
 
     for contact_point, predicate in contact_points_to_rdf(dataservice.contact_points, graph):
         d.set(predicate, contact_point)

udata/core/dataset/api.py

@@ -332,10 +332,10 @@ class DatasetsAtomFeedAPI(API):
             author_uri = None
             if dataset.organization:
                 author_name = dataset.organization.name
-                author_uri = dataset.organization.external_url
+                author_uri = dataset.organization.url_for()
             elif dataset.owner:
                 author_name = dataset.owner.fullname
-                author_uri = dataset.owner.external_url
+                author_uri = dataset.owner.url_for()
             feed.add_item(
                 dataset.title,
                 unique_id=dataset.id,
@@ -343,7 +343,7 @@ class DatasetsAtomFeedAPI(API):
                 content=md(dataset.description),
                 author_name=author_name,
                 author_link=author_uri,
-                link=dataset.external_url,
+                link=dataset.url_for(),
                 updateddate=dataset.last_modified,
                 pubdate=dataset.created_at,
             )
@@ -830,6 +830,7 @@ class DatasetSuggestAPI(API):
                     if dataset.owner
                     else None
                 ),
+                "page": dataset.self_web_url(),
             }
             for dataset in datasets.order_by(SUGGEST_SORTING).limit(args["size"])
         ]

udata/core/dataset/api_fields.py

@@ -204,18 +204,15 @@ dataset_ref_fields = api.inherit(
     {
         "title": fields.String(description="The dataset title", readonly=True),
         "acronym": fields.String(description="An optional dataset acronym", readonly=True),
-        "uri": fields.UrlFor(
-            "api.dataset",
-            lambda d: {"dataset": d},
+        "uri": fields.String(
+            attribute=lambda d: d.self_api_url(),
             description="The API URI for this dataset",
             readonly=True,
         ),
-        "page": fields.UrlFor(
-            "datasets.show",
-            lambda d: {"dataset": d},
-            description="The web page URL for this dataset",
+        "page": fields.String(
+            attribute=lambda d: d.self_web_url(),
+            description="The dataset web page URL",
             readonly=True,
-            fallback_endpoint="api.dataset",
         ),
     },
 )
@@ -393,18 +390,15 @@ dataset_fields = api.model(
         "license": fields.String(
             attribute="license.id", default=DEFAULT_LICENSE["id"], description="The dataset license"
         ),
-        "uri": fields.UrlFor(
-            "api.dataset",
-            lambda o: {"dataset": o},
-            description="The dataset API URI",
-            required=True,
+        "uri": fields.String(
+            attribute=lambda d: d.self_api_url(),
+            description="The API URI for this dataset",
+            readonly=True,
         ),
-        "page": fields.UrlFor(
-            "datasets.show",
-            lambda o: {"dataset": o},
-            description="The dataset page URL",
-            required=True,
-            fallback_endpoint="api.dataset",
+        "page": fields.String(
+            attribute=lambda d: d.self_web_url(),
+            description="The dataset web page URL",
+            readonly=True,
         ),
         "quality": fields.Raw(description="The dataset quality", readonly=True),
         "last_update": fields.ISODateTime(
@@ -441,12 +435,7 @@ dataset_suggestion_fields = api.model(
         "image_url": fields.ImageField(
             size=BIGGEST_LOGO_SIZE, description="The dataset (organization) logo URL", readonly=True
         ),
-        "page": fields.UrlFor(
-            "datasets.show_redirect",
-            lambda d: {"dataset": d["slug"]},
-            description="The web page URL for this dataset",
-            fallback_endpoint="api.dataset",
-        ),
+        "page": fields.String(description="The dataset web page URL", readonly=True),
     },
 )
 

udata/core/dataset/apiv2.py

@@ -198,18 +198,15 @@ dataset_fields = apiv2.model(
             default=DEFAULT_LICENSE["id"],
             description="The dataset license (full License object if `X-Get-Datasets-Full-Objects` is set, ID of the license otherwise)",
         ),
-        "uri": fields.UrlFor(
-            "api.dataset",
-            lambda o: {"dataset": o},
-            description="The dataset API URI",
-            required=True,
+        "uri": fields.String(
+            attribute=lambda d: d.self_api_url(),
+            description="The API URI for this dataset",
+            readonly=True,
         ),
-        "page": fields.UrlFor(
-            "datasets.show",
-            lambda o: {"dataset": o},
-            description="The dataset page URL",
-            required=True,
-            fallback_endpoint="api.dataset",
+        "page": fields.String(
+            attribute=lambda d: d.self_web_url(),
+            description="The dataset web page URL",
+            readonly=True,
         ),
         "quality": fields.Raw(description="The dataset quality", readonly=True),
         "last_update": fields.ISODateTime(

udata/core/dataset/csv.py

@@ -19,7 +19,7 @@ class DatasetCsvAdapter(csv.Adapter):
         "title",
         "slug",
         "acronym",
-        ("url", "external_url"),
+        ("url", lambda d: d.url_for()),
         ("organization", "organization.name"),
         ("organization_id", "organization.id"),
         ("owner", "owner.slug"),  # in case it's owned by a user, or introduce 'owner_type'?
@@ -63,7 +63,7 @@ class ResourcesCsvAdapter(csv.NestedAdapter):
         dataset_field("id"),
         dataset_field("title"),
         dataset_field("slug"),
-        dataset_field("url", "external_url"),
+        dataset_field("url", lambda r: r.url_for()),
         dataset_field("organization", lambda r: r.organization.name if r.organization else None),
         dataset_field(
             "organization_id", lambda r: str(r.organization.id) if r.organization else None

udata/core/dataset/models.py

@@ -9,7 +9,7 @@ import Levenshtein
 import requests
 from blinker import signal
 from dateutil.parser import parse as parse_dt
-from flask import current_app
+from flask import current_app, url_for
 from mongoengine import DynamicEmbeddedDocument
 from mongoengine import ValidationError as MongoEngineValidationError
 from mongoengine.fields import DateTimeField
@@ -20,14 +20,14 @@ from udata.api_fields import field
 from udata.app import cache
 from udata.core import storages
 from udata.core.activity.models import Auditable
+from udata.core.linkable import Linkable
 from udata.core.metrics.helpers import get_stock_metrics
 from udata.core.owned import Owned, OwnedQuerySet
 from udata.frontend.markdown import mdstrip
 from udata.i18n import lazy_gettext as _
-from udata.mail import get_mail_campaign_dict
 from udata.models import Badge, BadgeMixin, BadgesList, SpatialCoverage, WithMetrics, db
 from udata.mongo.errors import FieldValidationError
-from udata.uris import ValidationError, endpoint_for
+from udata.uris import ValidationError, cdata_url
 from udata.uris import validate as validate_url
 from udata.utils import get_by, hash_url, to_naive_datetime
 
@@ -456,9 +456,7 @@ class ResourceMixin(object):
 
         If this resource is updated and `url` changes, this property won't.
         """
-        return endpoint_for(
-            "datasets.resource", "api.resource_redirect", id=self.id, _external=True
-        )
+        return url_for("api.resource_redirect", id=self.id, _external=True)
 
     @cached_property
     def json_ld(self):
@@ -510,6 +508,12 @@ class Resource(ResourceMixin, WithMetrics, db.EmbeddedDocument):
         "views",
     ]
 
+    def url_for(self, **kwargs):
+        return self.self_web_url(**kwargs) or self.latest
+
+    def self_web_url(self, **kwargs):
+        return self.dataset.self_web_url(resource_id=self.id, **kwargs)
+
     @property
     def dataset(self):
         try:
@@ -542,7 +546,7 @@ class DatasetBadgeMixin(BadgeMixin):
     __badges__ = BADGES
 
 
-class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, db.Document):
+class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, Linkable, db.Document):
     title = field(db.StringField(required=True))
     acronym = field(db.StringField(max_length=128))
     # /!\ do not set directly the slug when creating or updating a dataset
@@ -719,10 +723,13 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, db.Document):
             "edit_resources": ResourceEditPermission(self),
         }
 
-    def url_for(self, *args, **kwargs):
-        return endpoint_for("datasets.show", "api.dataset", dataset=self, *args, **kwargs)
+    def self_web_url(self, **kwargs):
+        return cdata_url(f"/datasets/{self._link_id(**kwargs)}/", **kwargs)
 
-    display_url = property(url_for)
+    def self_api_url(self, **kwargs):
+        return url_for(
+            "api.dataset", dataset=self._link_id(**kwargs), **self._self_api_url_kwargs(**kwargs)
+        )
 
     @property
     def is_visible(self):
@@ -738,15 +745,6 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, db.Document):
             return self.title
         return "{title} ({acronym})".format(**self._data)
 
-    @property
-    def external_url(self):
-        return self.url_for(_external=True)
-
-    @property
-    def external_url_with_campaign(self):
-        extras = get_mail_campaign_dict()
-        return self.url_for(_external=True, **extras)
-
     @property
     def image_url(self):
         if self.organization:
@@ -1029,7 +1027,7 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, db.Document):
             "alternateName": self.slug,
             "dateCreated": self.created_at.isoformat(),
             "dateModified": self.last_modified.isoformat(),
-            "url": endpoint_for("datasets.show", "api.dataset", dataset=self, _external=True),
+            "url": self.url_for(),
             "name": self.title,
             "keywords": ",".join(self.tags),
             "distribution": [

udata/core/dataset/rdf.py

@@ -49,7 +49,6 @@ from udata.rdf import (
     themes_from_rdf,
     url_from_rdf,
 )
-from udata.uris import endpoint_for
 from udata.utils import get_by, safe_unicode, to_naive_datetime
 
 from .constants import OGC_SERVICE_FORMATS, UPDATE_FREQUENCIES
@@ -204,27 +203,16 @@ def resource_to_rdf(
     """
     graph = graph or Graph(namespace_manager=namespace_manager)
     if dataset and dataset.id:
-        id = URIRef(
-            endpoint_for(
-                "datasets.show_redirect",
-                "api.dataset",
-                dataset=dataset.id,
-                _external=True,
-                _anchor="resource-{0}".format(resource.id),
-            )
-        )
+        id = URIRef(resource.url_for(_useId=True))
     else:
         id = BNode(resource.id)
-    permalink = endpoint_for(
-        "datasets.resource", "api.resource_redirect", id=resource.id, _external=True
-    )
     r = graph.resource(id)
     r.set(RDF.type, DCAT.Distribution)
     r.set(DCT.identifier, Literal(resource.id))
     r.add(DCT.title, Literal(resource.title))
     r.add(DCT.description, Literal(resource.description))
     r.add(DCAT.downloadURL, URIRef(resource.url))
-    r.add(DCAT.accessURL, URIRef(permalink))
+    r.add(DCAT.accessURL, URIRef(resource.latest))
     r.add(DCT.issued, Literal(resource.created_at))
     r.add(DCT.modified, Literal(resource.last_modified))
     if dataset and dataset.license:
@@ -262,11 +250,7 @@ def dataset_to_graph_id(dataset: Dataset) -> URIRef | BNode:
     if dataset.harvest and dataset.harvest.uri:
         return URIRef(dataset.harvest.uri)
     elif dataset.id:
-        return URIRef(
-            endpoint_for(
-                "datasets.show_redirect", "api.dataset", dataset=dataset.id, _external=True
-            )
-        )
+        return URIRef(dataset.url_for(_useId=True))
     else:
         # Should not happen in production. Some test only
         # `build()` a dataset without saving it to the DB.
@@ -289,14 +273,7 @@ def dataset_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> RdfResour
         d.set(DCT.identifier, Literal(dataset.harvest.dct_identifier))
 
         alt = graph.resource(BNode())
-        alternate_identifier = Literal(
-            endpoint_for(
-                "datasets.show_redirect",
-                "api.dataset",
-                dataset=dataset.id,
-                _external=True,
-            )
-        )
+        alternate_identifier = Literal(dataset.url_for(_useId=True))
         alt.set(RDF.type, ADMS.Identifier)
         alt.set(DCT.creator, Literal(current_app.config["SITE_TITLE"]))
         alt.set(SKOS.notation, alternate_identifier)
@@ -313,17 +290,7 @@ def dataset_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> RdfResour
     if dataset.harvest and dataset.harvest.remote_url:
         d.set(DCAT.landingPage, URIRef(dataset.harvest.remote_url))
     elif dataset.id:
-        d.set(
-            DCAT.landingPage,
-            URIRef(
-                endpoint_for(
-                    "datasets.show_redirect",
-                    "api.dataset",
-                    dataset=dataset.id,
-                    _external=True,
-                )
-            ),
-        )
+        d.set(DCAT.landingPage, URIRef(dataset.url_for()))
 
     if dataset.acronym:
         d.set(SKOS.altLabel, Literal(dataset.acronym))

udata/core/dataset/search.py

@@ -87,7 +87,7 @@ class DatasetSearch(ModelSearchAdapter):
             "title": dataset.title,
             "description": dataset.description,
             "acronym": dataset.acronym or None,
-            "url": dataset.display_url,
+            "url": dataset.url_for(),
             "tags": dataset.tags,
             "license": getattr(dataset.license, "id", None),
             "badges": [badge.kind for badge in dataset.badges],

udata/core/discussions/api.py

@@ -74,7 +74,9 @@ discussion_fields = api.model(
             description="The organization who closed the discussion",
         ),
         "discussion": fields.Nested(message_fields),
-        "url": fields.UrlFor("api.discussion", description="The discussion API URI"),
+        "url": fields.String(
+            attribute=lambda d: d.self_api_url(), description="The discussion API URI"
+        ),
         "extras": fields.Raw(description="Extra attributes as key-value pairs"),
         "spam": fields.Nested(spam_fields),
         "permissions": fields.Nested(discussion_permissions_fields),

udata/core/discussions/models.py

@@ -1,10 +1,11 @@
 import logging
 from datetime import datetime
 
+from flask import url_for
 from flask_login import current_user
 
+from udata.core.linkable import Linkable
 from udata.core.spam.models import SpamMixin, spam_protected
-from udata.mail import get_mail_campaign_dict
 from udata.mongo import db
 
 from .signals import on_discussion_closed, on_new_discussion, on_new_discussion_comment
@@ -46,7 +47,7 @@ class Message(SpamMixin, db.EmbeddedDocument):
     def spam_report_message(self, breadcrumb):
         message = "Spam potentiel dans le message"
         if self.posted_by_org_or_user:
-            message += f" de [{self.posted_by_name}]({self.posted_by_org_or_user.external_url})"
+            message += f" de [{self.posted_by_name}]({self.posted_by_org_or_user.url_for()})"
 
         if len(breadcrumb) != 2:
             log.warning(
@@ -63,11 +64,11 @@ class Message(SpamMixin, db.EmbeddedDocument):
             )
             return message
 
-        message += f" sur la discussion « [{discussion.title}]({discussion.external_url}) »"
+        message += f" sur la discussion « [{discussion.title}]({discussion.url_for()}) »"
         return message
 
 
-class Discussion(SpamMixin, db.Document):
+class Discussion(SpamMixin, Linkable, db.Document):
     user = db.ReferenceField("User")
     organization = db.ReferenceField("Organization")
 
@@ -145,21 +146,16 @@ class Discussion(SpamMixin, db.Document):
 
         return OwnablePermission(self.subject).can()
 
-    @property
-    def external_url(self):
-        return self.subject.url_for(_anchor="discussion-{id}".format(id=self.id), _external=True)
+    def self_web_url(self, **kwargs):
+        return self.subject.self_web_url(append="/discussions", discussion_id=self.id, **kwargs)
 
-    @property
-    def external_url_with_campaign(self):
-        extras = get_mail_campaign_dict()
-        return self.subject.url_for(
-            _anchor="discussion-{id}".format(id=self.id), _external=True, **extras
-        )
+    def self_api_url(self, **kwargs):
+        return url_for("api.discussion", id=self.id, **self._self_api_url_kwargs(**kwargs))
 
     def spam_report_message(self, breadcrumb):
-        message = f"Spam potentiel sur la discussion « [{self.title}]({self.external_url}) »"
+        message = f"Spam potentiel sur la discussion « [{self.title}]({self.url_for()}) »"
         if self.user:
-            message += f" de [{self.user.fullname}]({self.user.external_url})"
+            message += f" de [{self.user.fullname}]({self.user.url_for()})"
 
         return message