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

use username in urls

Browse source
This commit is contained in:
Your Name 2021-12-15 22:31:18 -05:00
parent a39e5ac30f
commit f840c69a81
10 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mastodon/api.py
View file

@ -161,6 +161,7 @@ def get_cross_site_id(target_user, target_site, token):
cross_site_id = get_site_id(
target_user.username, target_user.mastodon_site, target_site, token)
if not cross_site_id:
print(f'unable to find cross_site_id for {target_user} on {target_site}')
return None
cross_site_info = CrossSiteUserInfo.objects.create(
uid=f"{target_user.username}@{target_user.mastodon_site}",

6
users/templates/users/book_list.html
View file

@ -176,7 +176,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>
@ -206,7 +206,7 @@
<h5 class="user-relation__label">
{% trans '关注的人' %}
</h5>
<a href="{% url 'users:following' user.id %}"
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
@ -223,7 +223,7 @@
<h5 class="user-relation__label">
{% trans '被他们关注' %}
</h5>
<a href="{% url 'users:followers' user.id %}"
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">

2
users/templates/users/data.html
View file

@ -190,7 +190,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>

6
users/templates/users/game_list.html
View file

@ -166,7 +166,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>
@ -196,7 +196,7 @@
<h5 class="user-relation__label">
{% trans '关注的人' %}
</h5>
<a href="{% url 'users:following' user.id %}"
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
@ -213,7 +213,7 @@
<h5 class="user-relation__label">
{% trans '被他们关注' %}
</h5>
<a href="{% url 'users:followers' user.id %}"
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">

30
users/templates/users/home.html
View file

@ -44,7 +44,7 @@
{{ wish_book_count }}
</span>
{% if wish_book_more %}
<a href="{% url 'users:book_list' user.id 'wish' %}"
<a href="{% url 'users:book_list' user.mastodon_username 'wish' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
<ul class="entity-sort__entity-list">
@ -72,7 +72,7 @@
{{ do_book_count }}
</span>
{% if do_book_more %}
<a href="{% url 'users:book_list' user.id 'do' %}"
<a href="{% url 'users:book_list' user.mastodon_username 'do' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -101,7 +101,7 @@
{{ collect_book_count }}
</span>
{% if collect_book_more %}
<a href="{% url 'users:book_list' user.id 'collect' %}"
<a href="{% url 'users:book_list' user.mastodon_username 'collect' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -130,7 +130,7 @@
{{ wish_movie_count }}
</span>
{% if wish_movie_more %}
<a href="{% url 'users:movie_list' user.id 'wish' %}"
<a href="{% url 'users:movie_list' user.mastodon_username 'wish' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -159,7 +159,7 @@
{{ do_movie_count }}
</span>
{% if do_movie_more %}
<a href="{% url 'users:movie_list' user.id 'do' %}"
<a href="{% url 'users:movie_list' user.mastodon_username 'do' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -188,7 +188,7 @@
{{ collect_movie_count }}
</span>
{% if collect_movie_more %}
<a href="{% url 'users:movie_list' user.id 'collect' %}"
<a href="{% url 'users:movie_list' user.mastodon_username 'collect' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -217,7 +217,7 @@
{{ wish_music_count }}
</span>
{% if wish_music_more %}
<a href="{% url 'users:music_list' user.id 'wish' %}"
<a href="{% url 'users:music_list' user.mastodon_username 'wish' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -258,7 +258,7 @@
{{ do_music_count }}
</span>
{% if do_music_more %}
<a href="{% url 'users:music_list' user.id 'do' %}"
<a href="{% url 'users:music_list' user.mastodon_username 'do' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -295,7 +295,7 @@
{{ collect_music_count }}
</span>
{% if collect_music_more %}
<a href="{% url 'users:music_list' user.id 'collect' %}"
<a href="{% url 'users:music_list' user.mastodon_username 'collect' %}"
class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
@ -332,7 +332,7 @@
{{ wish_game_count }}
</span>
{% if wish_game_more %}
<a href="{% url 'users:game_list' user.id 'wish' %}" class="entity-sort__more-link">{% trans '更多' %}</a>
<a href="{% url 'users:game_list' user.mastodon_username 'wish' %}" class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
<ul class="entity-sort__entity-list">
@ -360,7 +360,7 @@
{{ do_game_count }}
</span>
{% if do_game_more %}
<a href="{% url 'users:game_list' user.id 'do' %}" class="entity-sort__more-link">{% trans '更多' %}</a>
<a href="{% url 'users:game_list' user.mastodon_username 'do' %}" class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
<ul class="entity-sort__entity-list">
@ -388,7 +388,7 @@
{{ collect_game_count }}
</span>
{% if collect_game_more %}
<a href="{% url 'users:game_list' user.id 'collect' %}" class="entity-sort__more-link">{% trans '更多' %}</a>
<a href="{% url 'users:game_list' user.mastodon_username 'collect' %}" class="entity-sort__more-link">{% trans '更多' %}</a>
{% endif %}
<ul class="entity-sort__entity-list">
@ -484,7 +484,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>
@ -517,7 +517,7 @@
<h5 class="user-relation__label">
{% trans '关注的人' %}
</h5>
<a href="{% url 'users:following' user.id %}"
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
@ -534,7 +534,7 @@
<h5 class="user-relation__label">
{% trans '被他们关注' %}
</h5>
<a href="{% url 'users:followers' user.id %}"
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">

6
users/templates/users/movie_list.html
View file

@ -179,7 +179,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>
@ -209,7 +209,7 @@
<h5 class="user-relation__label">
{% trans '关注的人' %}
</h5>
<a href="{% url 'users:following' user.id %}"
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
@ -226,7 +226,7 @@
<h5 class="user-relation__label">
{% trans '被他们关注' %}
</h5>
<a href="{% url 'users:followers' user.id %}"
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">

6
users/templates/users/music_list.html
View file

@ -184,7 +184,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>
@ -214,7 +214,7 @@
<h5 class="user-relation__label">
{% trans '关注的人' %}
</h5>
<a href="{% url 'users:following' user.id %}"
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
@ -231,7 +231,7 @@
<h5 class="user-relation__label">
{% trans '被他们关注' %}
</h5>
<a href="{% url 'users:followers' user.id %}"
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">

2
users/templates/users/preferences.html
View file

@ -58,7 +58,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>

6
users/templates/users/relation_list.html
View file

@ -64,7 +64,7 @@
<div class="user-profile__header">
<!-- <img src="" class="user-profile__avatar mast-avatar" alt="{{ user.username }}"> -->
<img src="" class="user-profile__avatar mast-avatar">
<a href="{% url 'users:home' user.id %}">
<a href="{% url 'users:home' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname"></h5>
</a>
</div>
@ -94,7 +94,7 @@
<h5 class="user-relation__label">
{% trans '关注的人' %}
</h5>
<a href="{% url 'users:following' user.id %}"
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
@ -110,7 +110,7 @@
<h5 class="user-relation__label">
{% trans '被他们关注' %}
</h5>
<a href="{% url 'users:followers' user.id %}"
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">

2
users/urls.py
View file

@ -27,6 +27,8 @@ urlpatterns = [
path('<str:id>/following/', following, name='following'),
path('<str:id>/book/<str:status>/', book_list, name='book_list'),
path('<str:id>/movie/<str:status>/', movie_list, name='movie_list'),
path('<str:id>/music/<str:status>/', music_list, name='music_list'),
path('<str:id>/game/<str:status>/', game_list, name='game_list'),
path('report/', report, name='report'),
path('manage_report/', manage_report, name='manage_report'),
]