diff --git a/common/static/js/home.js b/common/static/js/home.js index 456c637b..fccd8a95 100644 --- a/common/static/js/home.js +++ b/common/static/js/home.js @@ -29,7 +29,8 @@ $(document).ready( function() { } $("#userInfoCard .mast-avatar").attr("src", userData.avatar); $("#userInfoCard .mast-displayname").html(userName); - $("#userInfoCard .mast-brief").text($(userData.note).text()); + $("#userInfoCard .mast-brief").text($("
"+userData.note.replace(/\
").text()); + $("#userInfoCard .mast-brief").html($("#userInfoCard .mast-brief").html().replace(/\n/g,'
')); $(userInfoSpinner).remove(); } ); diff --git a/mastodon/api.py b/mastodon/api.py index e9d17e1e..f45688c0 100644 --- a/mastodon/api.py +++ b/mastodon/api.py @@ -57,7 +57,7 @@ def get_relationships(site, id_list, token): headers = { 'Authorization': f'Bearer {token}' } - response = get(url, headers=headers, data=payload) + response = get(url, headers=headers, params=payload) return response.json() @@ -119,7 +119,7 @@ def get_site_id(username, user_site, target_site, token): headers = { 'Authorization': f'Bearer {token}' } - response = get(url, data=payload, headers=headers) + response = get(url, params=payload, headers=headers) data = response.json() if not data['accounts']: return None diff --git a/mastodon/models.py b/mastodon/models.py index b6ac1207..8b1f3145 100644 --- a/mastodon/models.py +++ b/mastodon/models.py @@ -27,7 +27,7 @@ class CrossSiteUserInfo(models.Model): # target site domain name target_site = models.CharField(_("target site domain name"), max_length=100) # target site id - site_id = models.PositiveIntegerField() + site_id = models.CharField(max_length=100, blank=False) class Meta: constraints = [ diff --git a/users/models.py b/users/models.py index ae8aed3c..bf1f054b 100644 --- a/users/models.py +++ b/users/models.py @@ -14,7 +14,7 @@ def report_image_path(instance, filename): class User(AbstractUser): - mastodon_id = models.IntegerField(blank=False) + mastodon_id = models.CharField(max_length=100, blank=False) # mastodon domain name, eg donotban.com mastodon_site = models.CharField(max_length=100, blank=False) # store the latest read announcement id, diff --git a/users/static/js/followers_list.js b/users/static/js/followers_list.js index 0c355f60..ec0e05a5 100644 --- a/users/static/js/followers_list.js +++ b/users/static/js/followers_list.js @@ -36,7 +36,8 @@ $(document).ready( function() { } $("#userInfoCard .mast-avatar").attr("src", userData.avatar); $("#userInfoCard .mast-displayname").html(userName); - $("#userInfoCard .mast-brief").text($(userData.note).text()); + $("#userInfoCard .mast-brief").text($("
"+userData.note.replace(/\
").text()); + $("#userInfoCard .mast-brief").html($("#userInfoCard .mast-brief").html().replace(/\n/g,'
')); $(userInfoSpinner).remove(); } ); diff --git a/users/static/js/following_list.js b/users/static/js/following_list.js index 0e6ca0ba..f0ac6c89 100644 --- a/users/static/js/following_list.js +++ b/users/static/js/following_list.js @@ -36,7 +36,8 @@ $(document).ready( function() { } $("#userInfoCard .mast-avatar").attr("src", userData.avatar); $("#userInfoCard .mast-displayname").html(userName); - $("#userInfoCard .mast-brief").text($(userData.note).text()); + $("#userInfoCard .mast-brief").text($("
"+userData.note.replace(/\
").text()); + $("#userInfoCard .mast-brief").html($("#userInfoCard .mast-brief").html().replace(/\n/g,'
')); $(userInfoSpinner).remove(); } );