Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compatible w Pleroma; schema migration required

Browse source
This commit is contained in:
Your Name 2021-09-11 19:53:36 -04:00
parent b71156fe7c
commit 5f43dc02bf
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/static/js/home.js
View file

@ -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($("<div>"+userData.note.replace(/\<br/g,'\n<br').replace(/\<p/g,'\n<p')+"</div>").text());
$("#userInfoCard .mast-brief").html($("#userInfoCard .mast-brief").html().replace(/\n/g,'<br/>'));
$(userInfoSpinner).remove();
}
);

4
mastodon/api.py
View file

@ -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

2
mastodon/models.py
View file

@ -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 = [

2
users/models.py
View file

@ -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,

3
users/static/js/followers_list.js
View file

@ -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($("<div>"+userData.note.replace(/\<br/g,'\n<br').replace(/\<p/g,'\n<p')+"</div>").text());
$("#userInfoCard .mast-brief").html($("#userInfoCard .mast-brief").html().replace(/\n/g,'<br/>'));
$(userInfoSpinner).remove();
}
);

3
users/static/js/following_list.js
View file

@ -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($("<div>"+userData.note.replace(/\<br/g,'\n<br').replace(/\<p/g,'\n<p')+"</div>").text());
$("#userInfoCard .mast-brief").html($("#userInfoCard .mast-brief").html().replace(/\n/g,'<br/>'));
$(userInfoSpinner).remove();
}
);