Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Replace Twitter with X (#36524)

Browse Source 
* feat: Replace Twitter with X


---------

Co-authored-by: Turchanikov Arsen <arsen.turchanikov@raccoongang.com>
This commit is contained in:
Stanislav
2025-12-02 17:43:26 +02:00
committed by GitHub
parent c8e6a760f9
commit 82f574ec2c
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/envs/common.py
View File

@@ -2858,10 +2858,10 @@ SOCIAL_PLATFORMS = {
'url_stub': 'facebook.com/',
'example': 'https://www.facebook.com/username'
},
'twitter': {
'display_name': 'Twitter',
'url_stub': 'twitter.com/',
'example': 'https://www.twitter.com/username'
'x': {
'display_name': 'X',
'url_stub': 'x.com/',
'example': 'https://www.x.com/username'
},
'linkedin': {
'display_name': 'LinkedIn',

6
openedx/core/djangoapps/user_api/accounts/serializers.py
View File

@@ -99,12 +99,12 @@ class SocialLinkSerializer(serializers.ModelSerializer):
def validate_platform(self, platform):
"""
Validate that the platform value is one of (facebook, twitter or linkedin)
Validate that the platform value is one of (facebook, x or linkedin)
"""
valid_platforms = ["facebook", "twitter", "linkedin"]
valid_platforms = ["facebook", "x", "linkedin"]
if platform not in valid_platforms:
raise serializers.ValidationError(
"The social platform must be facebook, twitter or linkedin"
"The social platform must be facebook, x or linkedin"
)
return platform

16
openedx/core/djangoapps/user_api/accounts/tests/test_api.py
View File

@@ -187,7 +187,7 @@ class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAc
def test_set_multiple_social_links(self):
social_links = [
dict(platform="facebook", social_link=f"https://www.facebook.com/{self.user.username}"),
dict(platform="twitter", social_link=f"https://www.twitter.com/{self.user.username}"),
dict(platform="x", social_link=f"https://www.x.com/{self.user.username}"),
]
update_account_settings(self.user, {"social_links": social_links})
account_settings = get_account_settings(self.default_request)[0]
@@ -200,7 +200,7 @@ class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAc
update_account_settings(self.user, {"social_links": original_social_links})
extra_social_links = [
dict(platform="twitter", social_link=f"https://www.twitter.com/{self.user.username}"),
dict(platform="x", social_link=f"https://www.x.com/{self.user.username}"),
dict(platform="linkedin", social_link=f"https://www.linkedin.com/in/{self.user.username}"),
]
update_account_settings(self.user, {"social_links": extra_social_links})
@@ -211,25 +211,25 @@ class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAc
def test_replace_social_links(self):
original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
original_twitter_link = dict(platform="twitter", social_link="https://www.twitter.com/myself")
update_account_settings(self.user, {"social_links": [original_facebook_link, original_twitter_link]})
original_x_link = dict(platform="x", social_link="https://www.x.com/myself")
update_account_settings(self.user, {"social_links": [original_facebook_link, original_x_link]})
modified_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/new_me")
update_account_settings(self.user, {"social_links": [modified_facebook_link]})
account_settings = get_account_settings(self.default_request)[0]
assert account_settings['social_links'] == [modified_facebook_link, original_twitter_link]
assert account_settings['social_links'] == [modified_facebook_link, original_x_link]
def test_remove_social_link(self):
original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
original_twitter_link = dict(platform="twitter", social_link="https://www.twitter.com/myself")
update_account_settings(self.user, {"social_links": [original_facebook_link, original_twitter_link]})
original_x_link = dict(platform="x", social_link="https://www.x.com/myself")
update_account_settings(self.user, {"social_links": [original_facebook_link, original_x_link]})
removed_facebook_link = dict(platform="facebook", social_link="")
update_account_settings(self.user, {"social_links": [removed_facebook_link]})
account_settings = get_account_settings(self.default_request)[0]
assert account_settings['social_links'] == [original_twitter_link]
assert account_settings['social_links'] == [original_x_link]
def test_unsupported_social_link_platform(self):
social_links = [

10
openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
View File

@@ -40,11 +40,11 @@ class UserAccountSettingsTest(TestCase):
('facebook', 'facebook.com/edX/', 'https://www.facebook.com/edX', True),
('facebook', 'HTTP://facebook.com/edX/', 'https://www.facebook.com/edX', True),
('facebook', 'www.evilwebsite.com/123', None, False),
('twitter', 'https://www.twiter.com/edX/', None, False),
('twitter', 'https://www.twitter.com/edX/123s', None, False),
('twitter', 'twitter.com/edX', 'https://www.twitter.com/edX', True),
('twitter', 'twitter.com/edX?foo=bar', 'https://www.twitter.com/edX?foo=bar', True),
('twitter', 'twitter.com/test.user', 'https://www.twitter.com/test.user', True),
('x', 'https://www.x.com/edX/', 'https://www.x.com/edX', True),
('x', 'https://www.x.com/edX/123s', None, False),
('x', 'x.com/edX', 'https://www.x.com/edX', True),
('x', 'x.com/edX?foo=bar', 'https://www.x.com/edX?foo=bar', True),
('x', 'x.com/test.user', 'https://www.x.com/test.user', True),
('linkedin', 'www.linkedin.com/harryrein', None, False),
('linkedin', 'www.linkedin.com/in/harryrein-1234', 'https://www.linkedin.com/in/harryrein-1234', True),
('linkedin', 'www.evilwebsite.com/123?www.linkedin.com/edX', None, False),