Merge ~ines-almeida/launchpad:social-accounts-display-accounts into launchpad:master

[Ines Almeida]

Update social accounts display view

Unmerged commits

39f0afb... by Ines Almeida on 2024-01-15

Add CSS to new social accounts display

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

5462f46... by Ines Almeida on 2024-01-15

Add matrix and update other social accounts display in profile

c51cae2... by Ines Almeida on 2024-01-15

Add new social accounts icons

7df013c... by Ines Almeida on 2024-01-15

Send user to profile page after matrix account form 'Save'

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

8e251f4... by Ines Almeida on 2024-01-12

ui: Add edit matrix accounts view

d78ac63... by Guruprasad on 2024-01-08

charm/launchpad-codehosting: Reconfigure haproxy relations on config changes

When a configuration variable used by an haproxy relation changes,
reconfigure that relation to apply the change.

efb7543... by Ines Almeida on 2024-01-15

Improve IRC edit view

 - Return user to profile after save
 - Add placeholder text to inputs
 - Remove extra titles

23c217d... by Ines Almeida on 2024-01-15

Add small margin-bottom to '.yui-u dl' elements

5bed095... by Ines Almeida on 2024-01-15

Add 'title' attribute to social accounts edit buttons

622ea06... by Ines Almeida on 2024-01-15

Move Jabber and IRC profile items into a 'Social Accounts' section

diff --git a/lib/canonical/launchpad/icing/css/components/_index.scss b/lib/canonical/launchpad/icing/css/components/_index.scss
index 3facac8..59e25ed 100644
--- a/lib/canonical/launchpad/icing/css/components/_index.scss
+++ b/lib/canonical/launchpad/icing/css/components/_index.scss
@@ -6,4 +6,5 @@
         'bug_listing',
         'portlets',
         'sharing',
+        'social_accounts',
         'yui_picker';
diff --git a/lib/canonical/launchpad/icing/css/components/social_accounts.scss b/lib/canonical/launchpad/icing/css/components/social_accounts.scss
new file mode 100644
index 0000000..a439581
--- /dev/null
+++ b/lib/canonical/launchpad/icing/css/components/social_accounts.scss
@@ -0,0 +1,17 @@
+.social_accounts {
+    &__icon {
+        opacity: 70%;
+        margin-right: 0.5em;
+        height: 1.2em;
+        width: 1.2em;
+        margin-bottom: -0.2em;
+    }
+
+    &__item {
+        margin-bottom: 0.2em;
+
+        & a.action-icon {
+            padding-bottom: 0;
+        }
+    }
+}
diff --git a/lib/canonical/launchpad/icing/css/typography.scss b/lib/canonical/launchpad/icing/css/typography.scss
index c6717f7..1b52e56 100644
--- a/lib/canonical/launchpad/icing/css/typography.scss
+++ b/lib/canonical/launchpad/icing/css/typography.scss
@@ -41,6 +41,13 @@ h1, h2, h3, h4, h5, h6 {
 
   .yui-u {
     padding-bottom: 1em;
+<<<<<<< lib/canonical/launchpad/icing/css/typography.scss
+=======
+
+    & dl {
+      margin-bottom: 1em;
+    }
+>>>>>>> lib/canonical/launchpad/icing/css/typography.scss
   }
 
   p {
diff --git a/lib/canonical/launchpad/images/social-irc.png b/lib/canonical/launchpad/images/social-irc.png
new file mode 100644
index 0000000..ed760ea
Binary files /dev/null and b/lib/canonical/launchpad/images/social-irc.png differ
diff --git a/lib/canonical/launchpad/images/social-jabber.png b/lib/canonical/launchpad/images/social-jabber.png
new file mode 100644
index 0000000..95cf8a0
Binary files /dev/null and b/lib/canonical/launchpad/images/social-jabber.png differ
diff --git a/lib/canonical/launchpad/images/social-matrix.png b/lib/canonical/launchpad/images/social-matrix.png
new file mode 100644
index 0000000..031885f
Binary files /dev/null and b/lib/canonical/launchpad/images/social-matrix.png differ
diff --git a/lib/canonical/launchpad/images/src/social-irc.svg b/lib/canonical/launchpad/images/src/social-irc.svg
new file mode 100644
index 0000000..7a47f88
--- /dev/null
+++ b/lib/canonical/launchpad/images/src/social-irc.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0.998 0 113.071 112.509" xmlns="http://www.w3.org/2000/svg">
+  <path style="fill: rgba(102, 102, 102, 0); stroke: rgb(0, 0, 0); stroke-width: 6px;" d="M 95.357 103.13 C 95.357 103.13 94.172 106.772 89.194 104.345 C 86.054 102.815 68.659 94.195 56.229 88.031 L 32.944 88.031 C 17.966 88.031 5.823 75.889 5.823 60.91 L 5.823 35.783 C 5.823 20.805 17.966 8.662 32.944 8.662 L 80.759 8.662 C 95.737 8.662 107.88 20.805 107.88 35.783 L 107.88 60.91 C 107.88 71.928 101.309 81.413 91.872 85.657 L 95.357 103.13 Z"/>
+  <path d="M 66.973 58.811 L 64.06 71.347 L 55.386 71.347 L 58.297 58.811 L 51.495 58.811 L 48.661 71.347 L 40.141 71.347 L 42.901 58.811 L 34.069 58.811 L 34.069 51.951 L 44.463 51.951 L 46.111 45.261 L 36.75 45.261 L 36.75 38.338 L 47.601 38.338 L 50.514 25.74 L 59.186 25.74 L 56.276 38.338 L 63.231 38.338 L 66.143 25.74 L 74.665 25.74 L 71.754 38.338 L 80.658 38.338 L 80.658 45.261 L 70.188 45.261 L 68.541 51.951 L 78.13 51.951 L 78.13 58.811 L 66.973 58.811 Z M 59.94 51.951 L 61.588 45.261 L 54.711 45.261 L 53.062 51.951 L 59.94 51.951 Z" style="stroke: rgba(186, 218, 85, 0); opacity: 0.9;"/>
+</svg>
\ No newline at end of file
diff --git a/lib/canonical/launchpad/images/src/social-jabber.svg b/lib/canonical/launchpad/images/src/social-jabber.svg
new file mode 100644
index 0000000..816d392
--- /dev/null
+++ b/lib/canonical/launchpad/images/src/social-jabber.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><path d="M9.597 11.737c0-.35-.065-.732-.268-1.025-.408-.588-1.283-.775-1.892-.405-.308.188-.48.515-.576.851-.191.668-.104 1.43.03 2.1.043.214.088.428.148.639.021.076.031.186.08.25.087.11.297.141.426.12.387-.065.291-.703.278-.974-.03-.634-.218-1.25-.036-1.881.076-.268.225-.568.494-.684.244-.105.49.023.586.261.156.385.117.83.215 1.23.033.137.07.272.131.399.018.037.043.113.094.108.126-.011.304-.22.398-.298.304-.25.616-.52.965-.705.165-.088.435-.23.603-.08a.612.612 0 0 1 .108.13c.198.31.002.55-.127.845-.166.38-.336.758-.577 1.098-.207.293-.49.549-.655.869-.107.205-.167.43-.123.663.036.188.181.301.373.257.143-.033.24-.156.322-.269.146-.202.281-.412.426-.615.28-.393.61-.76.846-1.183a3.41 3.41 0 0 0 .42-1.664c0-.474-.171-1.198-.723-1.298a.974.974 0 0 0-.326.01 1.432 1.432 0 0 0-.374.12 2.715 2.715 0 0 0-.818.637c-.146.16-.276.363-.449.495M9.078.016c-.435.058-.878.052-1.315.12-.838.129-1.64.389-2.425.703-.286.114-.568.241-.845.376-.103.05-.26.09-.343.17-.043.041-.039.139-.044.195-.014.156-.034.313-.05.47-.058.605-.1 1.229-.013 1.834.028.195.09.55.33.587.369.058.656-.397.837-.648.424-.586.905-1.132 1.6-1.394.817-.308 1.753-.381 2.618-.44 2.426-.167 5.078.277 6.865 2.064.254.254.495.524.7.82.8 1.159 1.223 2.477 1.427 3.86.096.65.161 1.308.013 1.955-.257 1.122-.932 2.1-1.706 2.931-.53.57-1.128 1.084-1.749 1.552-.347.261-.736.483-1.062.768-.375.329-.688.74-.925 1.179-.639 1.181-.81 2.602-.622 3.92.038.27.073.542.134.809.018.08.022.217.073.282.097.122.36.189.508.196.154.007.256-.11.294-.249.064-.236.026-.498-.012-.736-.076-.487-.147-.977-.125-1.471a3.71 3.71 0 0 1 1.026-2.425c.643-.673 1.512-1.061 2.243-1.625 1.474-1.136 2.794-2.668 3.301-4.492a5.194 5.194 0 0 0 .159-2.015c-.105-.849-.415-1.697-.708-2.497-.892-2.437-2.422-4.755-4.851-5.87-.964-.443-1.973-.645-3.016-.79-.49-.068-.98-.11-1.472-.132-.274-.012-.572-.042-.845-.006M5.277 15.796c-.473.068-.61.447-.523.876.112.548.543.965.97 1.295a6.03 6.03 0 0 0 3.884 1.238c.538-.023 1.124-.112 1.617-.34.265-.122.542-.563.181-.751a.59.59 0 0 0-.169-.051c-.157-.026-.333.041-.482.084-.263.075-.526.153-.797.196-.808.13-1.683-.055-2.352-.534-.542-.387-.98-.898-1.393-1.415-.253-.316-.482-.663-.936-.598m-.615 2.678c-.12.016-.259.011-.362.087-.215.158.022.476.135.62.328.417.76.763 1.192 1.068a7.832 7.832 0 0 0 4.03 1.442c.421.03.85 0 1.267-.07.152-.026.342-.037.482-.103.399-.186.284-.939-.072-1.106-.155-.073-.404.023-.567.046-.385.054-.771.06-1.158.05-1.015-.025-2.096-.338-2.98-.831a5.589 5.589 0 0 1-.966-.693c-.181-.16-.368-.42-.603-.502-.11-.037-.284-.023-.398-.008m.241 2.256a.638.638 0 0 0-.413.236c-.078.088-.152.167-.197.278-.246.609.41 1.183.864 1.47.504.32 1.055.558 1.616.758 1.266.45 2.752.739 4.066.336.391-.12.778-.338 1.062-.634.16-.167.27-.419-.024-.526-.174-.063-.385.098-.543.162a4.57 4.57 0 0 1-1.158.312c-.527.064-1.001-.052-1.508-.179a11.982 11.982 0 0 1-1.291-.373 4.457 4.457 0 0 1-1.026-.513c-.094-.066-.206-.125-.282-.211-.25-.282-.439-.612-.707-.88-.116-.116-.281-.256-.459-.236"/></svg>
\ No newline at end of file
diff --git a/lib/canonical/launchpad/images/src/social-matrix.svg b/lib/canonical/launchpad/images/src/social-matrix.svg
new file mode 100644
index 0000000..4e5bfb4
--- /dev/null
+++ b/lib/canonical/launchpad/images/src/social-matrix.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 27.9 32" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Matrix (protocol) logo</title>
+ <g transform="translate(-.095 .005)" fill="#040404">
+  <path d="m27.1 31.2v-30.5h-2.19v-0.732h3.04v32h-3.04v-0.732z"/>
+  <path d="m8.23 10.4v1.54h0.044c0.385-0.564 0.893-1.03 1.49-1.37 0.58-0.323 1.25-0.485 1.99-0.485 0.72 0 1.38 0.14 1.97 0.42 0.595 0.279 1.05 0.771 1.36 1.48 0.338-0.5 0.796-0.941 1.38-1.32 0.58-0.383 1.27-0.574 2.06-0.574 0.602 0 1.16 0.074 1.67 0.22 0.514 0.148 0.954 0.383 1.32 0.707 0.366 0.323 0.653 0.746 0.859 1.27 0.205 0.522 0.308 1.15 0.308 1.89v7.63h-3.13v-6.46c0-0.383-0.015-0.743-0.044-1.08-0.0209-0.307-0.103-0.607-0.242-0.882-0.133-0.251-0.336-0.458-0.584-0.596-0.257-0.146-0.606-0.22-1.05-0.22-0.44 0-0.796 0.085-1.07 0.253-0.272 0.17-0.485 0.39-0.639 0.662-0.159 0.287-0.264 0.602-0.308 0.927-0.052 0.347-0.078 0.697-0.078 1.05v6.35h-3.13v-6.4c0-0.338-7e-3 -0.673-0.021-1-0.0114-0.314-0.0749-0.623-0.188-0.916-0.108-0.277-0.3-0.512-0.55-0.673-0.258-0.168-0.636-0.253-1.14-0.253-0.198 0.0083-0.394 0.042-0.584 0.1-0.258 0.0745-0.498 0.202-0.705 0.374-0.228 0.184-0.422 0.449-0.584 0.794-0.161 0.346-0.242 0.798-0.242 1.36v6.62h-3.13v-11.4z"/>
+  <path d="m0.936 0.732v30.5h2.19v0.732h-3.04v-32h3.03v0.732z"/>
+ </g>
+</svg>
diff --git a/lib/lp/app/browser/configure.zcml b/lib/lp/app/browser/configure.zcml
index 9391c39..70e44d9 100644
--- a/lib/lp/app/browser/configure.zcml
+++ b/lib/lp/app/browser/configure.zcml
@@ -669,6 +669,13 @@
       />
 
   <adapter
+      for="lp.registry.interfaces.socialaccount.ISocialAccount"
+      provides="zope.traversing.interfaces.IPathAdapter"
+      factory="lp.app.browser.tales.SocialAccountFormatterAPI"
+      name="fmt"
+      />
+
+  <adapter
       for="datetime.timedelta"
       provides="zope.traversing.interfaces.IPathAdapter"
       factory="lp.app.browser.tales.DurationFormatterAPI"
diff --git a/lib/lp/app/browser/tales.py b/lib/lp/app/browser/tales.py
index eb5cad2..22490b6 100644
--- a/lib/lp/app/browser/tales.py
+++ b/lib/lp/app/browser/tales.py
@@ -55,6 +55,7 @@ from lp.registry.interfaces.distributionsourcepackage import (
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.projectgroup import IProjectGroup
+from lp.registry.interfaces.socialaccount import SocialPlatform
 from lp.services.compat import tzname
 from lp.services.utils import round_half_up
 from lp.services.webapp.authorization import check_permission
@@ -3049,3 +3050,41 @@ class IRCNicknameFormatterAPI(ObjectFormatterAPI):
             self._context.nickname,
             self._context.network,
         ).escapedtext
+
+
+@implementer(ITraversable)
+class SocialAccountFormatterAPI(ObjectFormatterAPI):
+    """Adapter from social account objects to a formatted string."""
+
+    traversable_names = {
+        "formatted_displayname": "formatted_displayname",
+    }
+
+    platform_icons = {
+        SocialPlatform.MATRIX: "social-matrix",
+    }
+
+    def icon(self):
+        icon = self.platform_icons[self._context.platform]
+        platform = self._context.platform.title
+        return (
+            f'<img class="social_accounts__icon" height="14" width="14" '
+            f'alt="{platform}" title="{platform}" src="/@@/{icon}" />'
+        )
+
+    def formatted_displayname(self, view_name=None):
+        if self._context.platform == SocialPlatform.MATRIX:
+            icon = self.icon()
+            return structured(
+                dedent(
+                    """\
+                    {icon}
+                    <strong>{nickname}</strong>
+                    <span class="lesser"> on </span>
+                    <strong>{network}</strong>
+                """.format(
+                        icon=icon, **self._context.identity
+                    )
+                ),
+            ).escapedtext
+        return None
diff --git a/lib/lp/registry/browser/configure.zcml b/lib/lp/registry/browser/configure.zcml
index 6fd29fb..eaf8e17 100644
--- a/lib/lp/registry/browser/configure.zcml
+++ b/lib/lp/registry/browser/configure.zcml
@@ -665,6 +665,12 @@
         rootsite="api"
         />
     <lp:url
+        for="lp.registry.interfaces.socialaccount.ISocialAccount"
+        path_expression="string:+socialaccount/${id}"
+        attribute_to_parent="person"
+        rootsite="api"
+        />
+    <lp:url
         for="lp.registry.interfaces.pillar.IPillarNameSet"
         path_expression="string:pillars"
         parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"
@@ -1213,6 +1219,13 @@
         template="../templates/person-editircnicknames.pt"
         />
     <browser:page
+        name="+editsocialaccounts-matrix"
+        for="lp.registry.interfaces.person.IPerson"
+        class="lp.registry.browser.person.PersonEditMatrixAccountsView"
+        permission="launchpad.Edit"
+        template="../templates/person-editmatrixaccounts.pt"
+        />
+    <browser:page
         name="+editjabberids"
         for="lp.registry.interfaces.person.IPerson"
         class="lp.registry.browser.person.PersonEditJabberIDsView"
diff --git a/lib/lp/registry/browser/person.py b/lib/lp/registry/browser/person.py
index 6dab8c8..f923680 100644
--- a/lib/lp/registry/browser/person.py
+++ b/lib/lp/registry/browser/person.py
@@ -19,6 +19,7 @@ __all__ = [
     "PersonEditEmailsView",
     "PersonEditIRCNicknamesView",
     "PersonEditJabberIDsView",
+    "PersonEditMatrixAccountsView",
     "PersonEditTimeZoneView",
     "PersonEditSSHKeysView",
     "PersonEditView",
@@ -152,6 +153,10 @@ from lp.registry.interfaces.persontransferjob import (
 from lp.registry.interfaces.pillar import IPillarNameSet
 from lp.registry.interfaces.poll import IPollSubset
 from lp.registry.interfaces.product import InvalidProductName, IProduct
+from lp.registry.interfaces.socialaccount import (
+    ISocialAccountSet,
+    SocialPlatform,
+)
 from lp.registry.interfaces.ssh import ISSHKeySet, SSHKeyAdditionError
 from lp.registry.interfaces.teammembership import (
     ITeamMembershipSet,
@@ -555,6 +560,14 @@ class PersonNavigation(BranchTraversalMixin, Navigation):
             return None
         return irc_nick
 
+    @stepthrough("+socialaccount")
+    def traverse_socialaccount(self, id):
+        """Traverse to this person's SocialAccount on the webservice layer."""
+        social_account = getUtility(ISocialAccountSet).get(id)
+        if social_account is None or social_account.person != self.context:
+            return None
+        return social_account
+
     @stepthrough("+oci-registry-credential")
     def traverse_oci_registry_credential(self, id):
         """Traverse to this person's OCI registry credentials."""
@@ -815,6 +828,7 @@ class PersonOverviewMenu(
         "editmailinglists",
         "editircnicknames",
         "editjabberids",
+        "editmatrixaccounts",
         "editsshkeys",
         "editpgpkeys",
         "editlocation",
@@ -877,13 +891,19 @@ class PersonOverviewMenu(
     def editircnicknames(self):
         target = "+editircnicknames"
         text = "Update IRC nicknames"
-        return Link(target, text, icon="edit")
+        return Link(target, text, icon="edit", summary=text)
+
+    @enabled_with_permission("launchpad.Edit")
+    def editmatrixaccounts(self):
+        target = "+editsocialaccounts-matrix"
+        text = "Update Matrix accounts"
+        return Link(target, text, icon="edit", summary=text)
 
     @enabled_with_permission("launchpad.Edit")
     def editjabberids(self):
         target = "+editjabberids"
         text = "Update Jabber IDs"
-        return Link(target, text, icon="edit")
+        return Link(target, text, icon="edit", summary=text)
 
     @enabled_with_permission("launchpad.Edit")
     def editlocation(self):
@@ -1660,6 +1680,17 @@ class PersonView(LaunchpadView, FeedsMixin, ContactViaWebLinksMixin):
         )
 
     @property
+    def should_show_matrix_accounts_section(self):
+        """Should the matrix accounts section be shown?
+
+        It's shown when the person has social accounts for the Matrix platform
+        registered or has rights to register new ones.
+        """
+        return bool(self.matrix_accounts) or (
+            check_permission("launchpad.Edit", self.context)
+        )
+
+    @property
     def should_show_sshkeys_section(self):
         """Should the 'SSH keys' section be shown?
 
@@ -1687,6 +1718,14 @@ class PersonView(LaunchpadView, FeedsMixin, ContactViaWebLinksMixin):
         return self.context.gpg_keys
 
     @cachedproperty
+    def matrix_accounts(self):
+        accounts = []
+        for account in self.context.social_accounts:
+            if account.platform == SocialPlatform.MATRIX:
+                accounts.append(account)
+        return accounts
+
+    @cachedproperty
     def is_probationary_or_invalid_user(self):
         """True when the user is not active or does not have karma.
 
@@ -2368,6 +2407,10 @@ class PersonEditIRCNicknamesView(LaunchpadFormView):
     def cancel_url(self):
         return canonical_url(self.context)
 
+    @property
+    def next_url(self):
+        return canonical_url(self.context)
+
     @action(_("Save Changes"), name="save")
     def save(self, action, data):
         """Process the IRC nicknames form."""
@@ -2406,6 +2449,70 @@ class PersonEditIRCNicknamesView(LaunchpadFormView):
                 )
 
 
+class PersonEditMatrixAccountsView(LaunchpadFormView):
+    schema = Interface
+
+    @property
+    def page_title(self):
+        return smartquote(f"{self.context.displayname}'s Matrix accounts")
+
+    label = page_title
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
+    @property
+    def next_url(self):
+        return canonical_url(self.context)
+
+    @property
+    def matrix_accounts(self):
+        accounts = []
+        for account in self.context.social_accounts:
+            if account.platform == SocialPlatform.MATRIX:
+                accounts.append(account)
+        return accounts
+
+    @action(_("Save Changes"), name="save")
+    def save(self, action, data):
+        """Process the matrix accounts form."""
+        form = self.request.form
+        for social_account in self.matrix_accounts:
+            if form.get(f"remove_{social_account.id}"):
+                social_account.destroySelf()
+
+            else:
+                updated_identity = {
+                    field: form.get(f"{field}_{social_account.id}")
+                    for field in SocialPlatform.matrix_identity_fields
+                }
+                if not all(updated_identity.values()):
+                    self.request.response.addErrorNotification(
+                        "Fields cannot be empty."
+                    )
+                    return
+
+                social_account.identity = updated_identity
+
+        new_account_identity = {
+            field_name: form.get(f"new_{field_name}")
+            for field_name in SocialPlatform.matrix_identity_fields
+        }
+
+        if all(new_account_identity.values()):
+            getUtility(ISocialAccountSet).new(
+                self.context, SocialPlatform.MATRIX, new_account_identity
+            )
+
+        elif any(new_account_identity.values()):
+            for field_key, field_value in new_account_identity.items():
+                self.__setattr__(f"new_{field_key}", field_value)
+            self.request.response.addErrorNotification(
+                "All fields must be filled."
+            )
+
+
 class PersonEditJabberIDsView(LaunchpadFormView):
     schema = IJabberID
     field_names = ["jabberid"]
diff --git a/lib/lp/registry/configure.zcml b/lib/lp/registry/configure.zcml
index 3cf36a8..041e557 100644
--- a/lib/lp/registry/configure.zcml
+++ b/lib/lp/registry/configure.zcml
@@ -650,6 +650,33 @@
             interface="lp.registry.interfaces.jabber.IJabberIDSet"/>
     </lp:securedutility>
     <class
+        class="lp.registry.model.person.SocialAccount">
+        <allow
+            interface="lp.registry.interfaces.role.IHasOwner"/>
+        <allow
+            attributes="
+                id
+                person
+                platform
+                identity"/>
+        <require
+            permission="launchpad.Edit"
+            set_schema="lp.registry.interfaces.socialaccount.ISocialAccount"
+            attributes="
+                destroySelf"/>
+    </class>
+    <class
+        class="lp.registry.model.person.SocialAccountSet">
+        <allow
+            interface="lp.registry.interfaces.socialaccount.ISocialAccountSet"/>
+    </class>
+    <lp:securedutility
+        class="lp.registry.model.person.SocialAccountSet"
+        provides="lp.registry.interfaces.socialaccount.ISocialAccountSet">
+        <allow
+            interface="lp.registry.interfaces.socialaccount.ISocialAccountSet"/>
+    </lp:securedutility>
+    <class
         class="lp.registry.model.pillar.PillarName">
         <allow
             interface="lp.registry.interfaces.pillar.IPillarName"/>
diff --git a/lib/lp/registry/doc/socialaccount.rst b/lib/lp/registry/doc/socialaccount.rst
new file mode 100644
index 0000000..05591eb
--- /dev/null
+++ b/lib/lp/registry/doc/socialaccount.rst
@@ -0,0 +1,32 @@
+Social Accounts
+==========
+
+Social Accounts are associated with a person and must be created through the
+ISocialAccountSet utility.
+
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.role import IHasOwner
+    >>> from lp.registry.interfaces.socialaccount import (
+    ...     ISocialAccount,
+    ...     ISocialAccountSet,
+    ...     SocialPlatform,
+    ... )
+
+The new() method of ISocialAccountSet takes the person who will be associated
+with the Social Account, a platform type and an identity dictionary.
+
+    >>> salgado = getUtility(IPersonSet).getByName("salgado")
+    >>> identity = {}
+    >>> identity["network"] = "abc.org"
+    >>> identity["nickname"] = "salgado"
+    >>> social_account = getUtility(ISocialAccountSet).new(
+    ...     salgado, SocialPlatform.MATRIX, identity
+    ... )
+
+The returned SocialAccount object provides both ISocialAccount and IHasOwner.
+
+    >>> from lp.testing import verifyObject
+    >>> verifyObject(ISocialAccount, social_account)
+    True
+    >>> verifyObject(IHasOwner, social_account)
+    True
diff --git a/lib/lp/registry/interfaces/person.py b/lib/lp/registry/interfaces/person.py
index 3aeae4c..68be805 100644
--- a/lib/lp/registry/interfaces/person.py
+++ b/lib/lp/registry/interfaces/person.py
@@ -121,6 +121,7 @@ from lp.registry.interfaces.location import (
 from lp.registry.interfaces.mailinglistsubscription import (
     MailingListAutoSubscribePolicy,
 )
+from lp.registry.interfaces.socialaccount import ISocialAccount
 from lp.registry.interfaces.ssh import ISSHKey
 from lp.registry.interfaces.teammembership import (
     ITeamMembership,
@@ -1030,6 +1031,14 @@ class IPersonViewRestricted(
         ),
         exported_as="jabber_ids",
     )
+    social_accounts = exported(
+        CollectionField(
+            title=_("List of Social Accounts of this Person."),
+            readonly=True,
+            required=False,
+            value_type=Reference(schema=ISocialAccount),
+        )
+    )
     team_memberships = exported(
         CollectionField(
             title=_(
@@ -3241,3 +3250,4 @@ patch_reference_property(IIrcID, "person", IPerson)
 patch_reference_property(IJabberID, "person", IPerson)
 patch_reference_property(IWikiName, "person", IPerson)
 patch_reference_property(IEmailAddress, "person", IPerson)
+patch_reference_property(ISocialAccount, "person", IPerson)
diff --git a/lib/lp/registry/interfaces/socialaccount.py b/lib/lp/registry/interfaces/socialaccount.py
new file mode 100644
index 0000000..e8c219e
--- /dev/null
+++ b/lib/lp/registry/interfaces/socialaccount.py
@@ -0,0 +1,103 @@
+# Copyright 2024 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""SocialAccount interfaces."""
+
+__all__ = [
+    "ISocialAccount",
+    "ISocialAccountSet",
+    "SocialPlatform",
+    "SocialAccountIdentityError",
+]
+
+import http.client
+
+from lazr.enum import DBEnumeratedType, DBItem
+from lazr.restful.declarations import (
+    error_status,
+    exported,
+    exported_as_webservice_entry,
+)
+from lazr.restful.fields import Reference
+from zope.interface import Interface
+from zope.schema import Choice, Dict, Int, TextLine
+
+from lp import _
+from lp.registry.interfaces.role import IHasOwner
+
+
+class SocialPlatform(DBEnumeratedType):
+    """Social Platform Type
+
+    Social Account is associated with a SocialPlatform.
+    """
+
+    MATRIX = DBItem(
+        1,
+        """
+        Matrix platform
+
+        The Social Account will hold Matrix account info.
+        """,
+    )
+    matrix_identity_fields = ["nickname", "network"]
+
+
+# XXX pelpsi 2023-12-14 bug=760849: "beta" is a lie to get WADL generation
+# working.
+@exported_as_webservice_entry("social_account", as_of="beta")
+class ISocialAccount(IHasOwner):
+    """Social Account"""
+
+    id = Int(title=_("Database ID"), required=True, readonly=True)
+    # schema=Interface will be overridden in person.py because of circular
+    # dependencies.
+    person = exported(
+        Reference(
+            title=_("Owner"), required=True, schema=Interface, readonly=True
+        )
+    )
+
+    platform = exported(
+        Choice(
+            title=_("Social platform"),
+            required=True,
+            vocabulary=SocialPlatform,
+        )
+    )
+
+    identity = exported(
+        Dict(
+            title=_("Identity"),
+            key_type=TextLine(),
+            required=True,
+            readonly=False,
+            description=_(
+                "A dictionary with the identity attributes and values for the "
+                "social account. The format is specific for each platform. "
+            ),
+        )
+    )
+
+    def destroySelf():
+        """Delete this SocialAccount from the database."""
+
+
+class ISocialAccountSet(Interface):
+    """The set of SocialAccounts."""
+
+    def new(self, person, platform, identity):
+        """Create a new SocialAccount pointing to the given Person."""
+
+    def getByPerson(person):
+        """Return all SocialAccounts for the given person."""
+
+    def get(id):
+        """Return the SocialAccount with the given id or None."""
+
+
+@error_status(http.client.BAD_REQUEST)
+class SocialAccountIdentityError(Exception):
+    """Raised when Social Account's identity is
+    invalid for a given social platform.
+    """
diff --git a/lib/lp/registry/interfaces/webservice.py b/lib/lp/registry/interfaces/webservice.py
index 215c9ef..fc783eb 100644
--- a/lib/lp/registry/interfaces/webservice.py
+++ b/lib/lp/registry/interfaces/webservice.py
@@ -35,6 +35,7 @@ __all__ = [
     "IServiceFactory",
     "ISharingService",
     "ISSHKey",
+    "ISocialAccount",
     "ISourcePackage",
     "ISourcePackageName",
     "ITeam",
@@ -94,6 +95,7 @@ from lp.registry.interfaces.productseries import (
 )
 from lp.registry.interfaces.projectgroup import IProjectGroup, IProjectGroupSet
 from lp.registry.interfaces.sharingservice import ISharingService
+from lp.registry.interfaces.socialaccount import ISocialAccount
 from lp.registry.interfaces.sourcepackage import (
     ISourcePackage,
     ISourcePackageEdit,
diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index 779616d..996e9b3 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -19,6 +19,8 @@ __all__ = [
     "PersonLanguage",
     "PersonSet",
     "PersonSettings",
+    "SocialAccount",
+    "SocialAccountSet",
     "SSHKey",
     "SSHKeySet",
     "TeamInvitationEvent",
@@ -40,6 +42,7 @@ import transaction
 from lazr.delegates import delegate_to
 from lazr.restful.utils import get_current_browser_request, smartquote
 from requests import PreparedRequest
+from storm.databases.postgres import JSON
 from storm.expr import (
     SQL,
     Alias,
@@ -161,6 +164,12 @@ from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
 from lp.registry.interfaces.product import IProduct, IProductSet
 from lp.registry.interfaces.projectgroup import IProjectGroup
 from lp.registry.interfaces.role import IPersonRoles
+from lp.registry.interfaces.socialaccount import (
+    ISocialAccount,
+    ISocialAccountSet,
+    SocialAccountIdentityError,
+    SocialPlatform,
+)
 from lp.registry.interfaces.ssh import (
     SSH_TEXT_TO_KEY_TYPE,
     ISSHKey,
@@ -646,6 +655,7 @@ class Person(
     signedcocs = ReferenceSet("id", "SignedCodeOfConduct.owner_id")
     _ircnicknames = ReferenceSet("id", "IrcID.person_id")
     jabberids = ReferenceSet("id", "JabberID.person_id")
+    _social_accounts = ReferenceSet("id", "SocialAccount.person_id")
 
     visibility = DBEnum(
         enum=PersonVisibility,
@@ -688,6 +698,10 @@ class Person(
         return list(self._ircnicknames)
 
     @cachedproperty
+    def social_accounts(self):
+        return list(self._social_accounts)
+
+    @cachedproperty
     def languages(self):
         """See `IPerson`."""
         results = Store.of(self).find(
@@ -2779,6 +2793,7 @@ class Person(
             ("sharingjob", "grantee"),
             ("signedcodeofconduct", "owner"),
             ("snapbuild", "requester"),
+            ("socialaccount", "person"),
             ("specificationsubscription", "person"),
             ("sshkey", "person"),
             ("structuralsubscription", "subscriber"),
@@ -5321,6 +5336,55 @@ class WikiNameSet:
         return wiki_name
 
 
+@implementer(ISocialAccount)
+class SocialAccount(StormBase, HasOwnerMixin):
+    __storm_table__ = "SocialAccount"
+
+    id = Int(primary=True)
+    person_id = Int(name="person", allow_none=False)
+    person = Reference(person_id, "Person.id")
+    platform = DBEnum(
+        name="platform",
+        allow_none=False,
+        enum=SocialPlatform,
+    )
+    identity = JSON(name="identity", allow_none=False)
+
+    def __init__(self, person, platform, identity):
+        super().__init__()
+        self.person = person
+        self.platform = platform
+        self.identity = identity
+
+    def destroySelf(self):
+        IStore(self).remove(self)
+
+
+@implementer(ISocialAccountSet)
+class SocialAccountSet:
+    def get(self, id):
+        """See `ISocialAccountSet`."""
+        return IStore(SocialAccount).get(SocialAccount, int(id))
+
+    def getByPerson(self, person):
+        """See `ISocialAccountSet`."""
+        return IStore(SocialAccount).find(SocialAccount, person=person)
+
+    def new(self, person, platform, identity):
+        """See `ISocialAccountSet`."""
+        if platform == SocialPlatform.MATRIX:
+            if "nickname" not in identity or "network" not in identity:
+                raise SocialAccountIdentityError(
+                    "You must provide `nickname` and `network`"
+                    " for a matrix account."
+                )
+        social_account = SocialAccount(
+            person=person, platform=platform, identity=identity
+        )
+        IStore(social_account).flush()
+        return social_account
+
+
 @implementer(IJabberID)
 class JabberID(StormBase, HasOwnerMixin):
     __storm_table__ = "JabberID"
diff --git a/lib/lp/registry/stories/webservice/xx-person.rst b/lib/lp/registry/stories/webservice/xx-person.rst
index 073c8a4..7e93f8b 100644
--- a/lib/lp/registry/stories/webservice/xx-person.rst
+++ b/lib/lp/registry/stories/webservice/xx-person.rst
@@ -53,6 +53,7 @@ for teams (as they're defined in the ITeam interface).
     recipes_collection_link: 'http://.../~salgado/recipes'
     resource_type_link: 'http://.../#person'
     self_link: 'http://.../~salgado'
+    social_accounts_collection_link: 'http://.../~salgado/social_accounts'
     sshkeys_collection_link: 'http://.../~salgado/sshkeys'
     sub_teams_collection_link: 'http://.../~salgado/sub_teams'
     super_teams_collection_link: 'http://.../~salgado/super_teams'
@@ -116,6 +117,7 @@ for teams (as they're defined in the ITeam interface).
     renewal_policy: 'invite them to apply for renewal'
     resource_type_link: 'http://.../#team'
     self_link: 'http://.../~ubuntu-team'
+    social_accounts_collection_link: 'http://.../~ubuntu-team/social_accounts'
     sshkeys_collection_link: 'http://.../~ubuntu-team/sshkeys'
     sub_teams_collection_link: 'http://.../~ubuntu-team/sub_teams'
     subscription_policy: 'Moderated Team'
@@ -635,6 +637,18 @@ to, obviously.
     HTTP/1.1 404 Not Found
     ...
 
+Social Accounts
+..........
+
+Social Accounts of a person are also linked.
+
+    >>> mark = webservice.get("/~mark").jsonBody()
+    >>> social_accounts_link = mark["social_accounts_collection_link"]
+    >>> print(social_accounts_link)
+    http://.../~mark/social_accounts
+    >>> print_self_link_of_entries(
+    ...     webservice.get(social_accounts_link).jsonBody()
+    ... )
 
 IRC nicknames
 .............
diff --git a/lib/lp/registry/templates/person-editircnicknames.pt b/lib/lp/registry/templates/person-editircnicknames.pt
index ec64be1..bc034fe 100644
--- a/lib/lp/registry/templates/person-editircnicknames.pt
+++ b/lib/lp/registry/templates/person-editircnicknames.pt
@@ -46,21 +46,17 @@
             </label>
           </td>
         </tr>
-
       </div>
 
     <tr>
-      <td><label>Network:</label></td>
-      <td><label>Nickname:</label></td>
-    </tr>
-
-    <tr>
       <td>
         <input name="newnetwork" type="text"
+               placeholder="Enter new network"
                tal:attributes="value view/newnetwork|nothing" />
       </td>
       <td>
         <input name="newnick" type="text"
+               placeholder="Enter new nickname"
                tal:attributes="value view/newnick|nothing" />
       </td>
     </tr>
diff --git a/lib/lp/registry/templates/person-editmatrixaccounts.pt b/lib/lp/registry/templates/person-editmatrixaccounts.pt
new file mode 100644
index 0000000..7d8e659
--- /dev/null
+++ b/lib/lp/registry/templates/person-editmatrixaccounts.pt
@@ -0,0 +1,73 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only"
+  i18n:domain="launchpad"
+>
+<body>
+
+<div metal:fill-slot="main">
+<div metal:use-macro="context/@@launchpad_form/form">
+  <div metal:fill-slot="widgets">
+
+    <p tal:condition="view/error_message"
+       tal:content="structure view/error_message/escapedtext" class="error message" />
+
+    <table>
+
+      <div tal:condition="view/matrix_accounts">
+        <tr>
+          <td><label>Network:</label></td>
+          <td><label>Nickname:</label></td>
+        </tr>
+        <tr tal:repeat="matrix_account view/matrix_accounts">
+          <td>
+            <input tal:attributes="name string:network_${matrix_account/id};
+                                   value matrix_account/identity/network"
+                   type="text" style="margin-bottom: 0.5em;"/>
+          </td>
+          <td>
+            <input type="text"
+                   tal:attributes="name string:nickname_${matrix_account/id};
+                                   value matrix_account/identity/nickname" />
+          </td>
+
+          <td>
+            <label>
+              <input type="checkbox"
+                     value="Remove"
+                     tal:attributes="name string:remove_${matrix_account/id}" />
+              Remove
+            </label>
+          </td>
+        </tr>
+      </div>
+
+      <tr>
+        <td>
+          <input name="new_network"
+                 type="text"
+                 placeholder="Enter new network"
+                 tal:attributes="value view/new_network|nothing" />
+        </td>
+        <td>
+          <input name="new_nickname" 
+                 type="text"
+                 placeholder="Enter new nickname"
+                 tal:attributes="value view/new_nickname|nothing" />
+        </td>
+      </tr>
+
+      <tr>
+        <td class="formHelp">Example: ubuntu.com</td>
+        <td class="formHelp">Example: mark</td>
+      </tr>
+    </table>
+  </div>
+</div>
+</div>
+
+</body>
+</html>
diff --git a/lib/lp/registry/templates/person-portlet-contact-details.pt b/lib/lp/registry/templates/person-portlet-contact-details.pt
index e9b37b2..dd6ba64 100644
--- a/lib/lp/registry/templates/person-portlet-contact-details.pt
+++ b/lib/lp/registry/templates/person-portlet-contact-details.pt
@@ -170,8 +170,9 @@
              class="sprite maybe action-icon">Karma help</a>
       </dd>
     </dl>
-  </div>
+</div>
 
+<<<<<<< lib/lp/registry/templates/person-portlet-contact-details.pt
   <div class="yui-u two-column-list">
     <dt>Social Accounts:</dt>
     <dl tal:condition="view/should_show_ircnicknames_section">
@@ -202,6 +203,54 @@
     </dl>
   </div>
 
+=======
+    <div class="yui-u social_accounts">
+      <dl id="social-accounts"> 
+        <dt>Social accounts:</dt>
+
+        <dd class="social_accounts__item" tal:repeat="ircnick context/ircnicknames">
+          <img class="social_accounts__icon" alt="IRC" title="IRC" src="/@@/social-irc"/>
+          <span tal:replace="structure ircnick/fmt:formatted_displayname"/>
+          <a tal:condition="repeat/ircnick/end" tal:replace="structure overview_menu/editircnicknames/fmt:icon"/>
+        </dd>
+
+        <dd class="social_accounts__item" tal:repeat="jabberid context/jabberids">
+          <img class="social_accounts__icon" alt="Jabber" title="Jabber" src="/@@/social-jabber" />
+          <span tal:replace="jabberid/jabberid/fmt:obfuscate-email"/>
+          <a tal:condition="repeat/jabberid/end" tal:replace="structure overview_menu/editjabberids/fmt:icon"/>
+        </dd>
+
+        <dd class="social_accounts__item" tal:repeat="social_account context/social_accounts">
+          <span tal:replace="structure social_account/fmt:formatted_displayname"/>
+          <a tal:condition="repeat/social_account/end"  tal:replace="structure overview_menu/editmatrixaccounts/fmt:icon" />
+        </dd>
+
+        <tal:irc condition="view/should_show_ircnicknames_section">
+          <dd class="social_accounts__item" tal:condition="not: context/ircnicknames">
+            <img class="social_accounts__icon" alt="IRC" title="IRC" src="/@@/social-irc"/>
+            <span>No IRC nicknames registered.</span>
+            <a tal:replace="structure overview_menu/editircnicknames/fmt:icon"/>
+          </dd>
+        </tal:irc>
+
+        <tal:jabber condition="view/should_show_jabberids_section">
+          <dd class="social_accounts__item" tal:condition="context/jabberids/is_empty">
+            <img class="social_accounts__icon" alt="Jabber" title="Jabber" src="/@@/social-jabber" />
+            <span>No Jabber IDs registered.</span>
+            <a tal:replace="structure overview_menu/editjabberids/fmt:icon" />
+          </dd>
+        </tal:jabber>
+
+        <tal:matrix condition="view/should_show_matrix_accounts_section">
+          <dd class="social_accounts__item" tal:condition="not: context/social_accounts">
+            <span>No matrix accounts registered.</span>
+            <a tal:replace="structure overview_menu/editmatrixaccounts/fmt:icon" />
+          </dd>
+        </tal:matrix>
+
+      </dl>
+    </div>
+>>>>>>> lib/lp/registry/templates/person-portlet-contact-details.pt
 </div>
 
 </tal:root>
diff --git a/lib/lp/registry/tests/test_person.py b/lib/lp/registry/tests/test_person.py
index 5381103..47c0ec3 100644
--- a/lib/lp/registry/tests/test_person.py
+++ b/lib/lp/registry/tests/test_person.py
@@ -38,6 +38,11 @@ from lp.registry.interfaces.karma import IKarmaCacheManager
 from lp.registry.interfaces.person import ImmutableVisibilityError, IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.product import IProductSet
+from lp.registry.interfaces.socialaccount import (
+    ISocialAccountSet,
+    SocialAccountIdentityError,
+    SocialPlatform,
+)
 from lp.registry.interfaces.teammembership import ITeamMembershipSet
 from lp.registry.model.karma import KarmaCategory, KarmaTotalCache
 from lp.registry.model.person import Person, get_recipients
@@ -438,6 +443,113 @@ class TestPerson(TestCaseWithFactory):
         self.assertEqual(None, person.homepage_content)
         self.assertEqual(None, person.teamdescription)
 
+    def test_social_account(self):
+        user = self.factory.makePerson()
+        attributes = {}
+        attributes["network"] = "abc"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user, SocialPlatform.MATRIX, attributes
+        )
+
+        self.assertEqual(len(user.social_accounts), 1)
+        social_account = user.social_accounts[0]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "abc")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
+    def test_malformed_matrix_account(self):
+        user = self.factory.makePerson()
+        attributes = {}
+        attributes["network"] = "abc"
+        attributes["name"] = "test-nickname"
+        utility = getUtility(ISocialAccountSet)
+
+        self.assertRaises(
+            SocialAccountIdentityError,
+            utility.new,
+            user,
+            SocialPlatform.MATRIX,
+            attributes,
+        )
+
+    def test_multiple_social_accounts(self):
+        user = self.factory.makePerson()
+        attributes = {}
+        attributes["network"] = "abc"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user, SocialPlatform.MATRIX, attributes
+        )
+        attributes = {}
+        attributes["network"] = "def"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user, SocialPlatform.MATRIX, attributes
+        )
+
+        self.assertEqual(len(user.social_accounts), 2)
+        social_account = user.social_accounts[1]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "def")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
+        social_account = user.social_accounts[0]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "abc")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
+    def test_multiple_social_accounts_on_multiple_users(self):
+        user = self.factory.makePerson()
+        attributes = {}
+        attributes["network"] = "abc"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user, SocialPlatform.MATRIX, attributes
+        )
+        attributes = {}
+        attributes["network"] = "def"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user, SocialPlatform.MATRIX, attributes
+        )
+
+        user_two = self.factory.makePerson()
+        attributes = {}
+        attributes["network"] = "ghi"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user_two, SocialPlatform.MATRIX, attributes
+        )
+        attributes = {}
+        attributes["network"] = "lmn"
+        attributes["nickname"] = "test-nickname"
+        getUtility(ISocialAccountSet).new(
+            user_two, SocialPlatform.MATRIX, attributes
+        )
+
+        self.assertEqual(len(user.social_accounts), 2)
+        social_account = user.social_accounts[1]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "def")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
+        social_account = user.social_accounts[0]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "abc")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
+        self.assertEqual(len(user_two.social_accounts), 2)
+        social_account = user_two.social_accounts[1]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "lmn")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
+        social_account = user_two.social_accounts[0]
+        self.assertEqual(social_account.platform, SocialPlatform.MATRIX)
+        self.assertEqual(social_account.identity["network"], "ghi")
+        self.assertEqual(social_account.identity["nickname"], "test-nickname")
+
     def test_getAffiliatedPillars_kinds(self):
         # Distributions, project groups, and projects are returned in this
         # same order.
diff --git a/lib/lp/services/webservice/wadl-to-refhtml.xsl b/lib/lp/services/webservice/wadl-to-refhtml.xsl
index 0f6d973..4ddccb9 100644
--- a/lib/lp/services/webservice/wadl-to-refhtml.xsl
+++ b/lib/lp/services/webservice/wadl-to-refhtml.xsl
@@ -425,6 +425,12 @@
                 <xsl:text>/+jabberid/</xsl:text>
                 <var>&lt;id&gt;</var>
             </xsl:when>
+            <xsl:when test="@id = 'socialaccount_id'">
+                <xsl:text>/</xsl:text>
+                <var>&lt;person.name&gt;</var>
+                <xsl:text>/+socialaccount/</xsl:text>
+                <var>&lt;id&gt;</var>
+            </xsl:when>
             <xsl:when test="@id = 'irc_id'">
                 <xsl:text>/</xsl:text>
                 <var>&lt;person.name&gt;</var>