is_following is more aligned with timeline
This commit is contained in:
parent
4f61920308
commit
386f6a2a40
3 changed files with 7 additions and 7 deletions
|
@ -272,10 +272,10 @@ def send_verification_link(user_id, action, email):
|
|||
subject = f'{settings.SITE_INFO["site_name"]} - {_("注册新账号")}'
|
||||
url = settings.SITE_INFO["site_url"] + "/account/register_email?c=" + v
|
||||
msg = f"你好,\n本站没有与{email}关联的账号。你希望注册一个新账号吗?\n"
|
||||
msg += f"如果你已经注册过本站或联邦宇宙(长毛象),不必重新注册,只要用联邦宇宙身份登录本站,再关联这个电子邮件地址,未来就可以通过邮件登录。\n"
|
||||
msg += f"\n如果你已注册过本站或某个联邦宇宙(长毛象)实例,不必重新注册,只要用联邦宇宙身份登录本站,再关联这个电子邮件地址,即可通过邮件登录。\n"
|
||||
msg += f"\n如果你还没有联邦宇宙身份,可以访问这里选择实例并创建一个: https://joinmastodon.org/zh/servers\n"
|
||||
if settings.ALLOW_EMAIL_ONLY_ACCOUNT:
|
||||
msg += f"\n如果你不便使用联邦宇宙身份,可以点击以下链接注册新的本站账号,以后再关联到联邦宇宙。\n{url}\n"
|
||||
msg += f"\n如果你不便使用联邦宇宙身份,也可以点击以下链接使用电子邮件注册一个新账号,以后再关联到联邦宇宙。\n{url}\n"
|
||||
msg += f"\n如果你没有打算用此电子邮件地址注册或登录本站,请忽略此邮件。"
|
||||
else:
|
||||
raise ValueError("Invalid action")
|
||||
|
|
|
@ -473,8 +473,8 @@ class User(AbstractUser):
|
|||
self.mastodon_acct in target.mastodon_followers
|
||||
if target.locked
|
||||
else target.pk in self.following
|
||||
or target.mastodon_acct in self.mastodon_following
|
||||
or self.mastodon_acct in target.mastodon_followers
|
||||
# or target.mastodon_acct in self.mastodon_following
|
||||
# or self.mastodon_acct in target.mastodon_followers
|
||||
)
|
||||
|
||||
def is_followed_by(self, target):
|
||||
|
|
|
@ -77,12 +77,12 @@
|
|||
onchange="switch_login()"
|
||||
name="method">
|
||||
<option disabled value="">选择登录方式</option>
|
||||
<option selected value="fedi">通过联邦宇宙</option>
|
||||
<option value="email">通过电子邮件</option>
|
||||
<option selected value="fedi">联邦宇宙授权</option>
|
||||
<option value="email">电子邮件验证</option>
|
||||
</select>
|
||||
<input style="width:100%"
|
||||
type='submit'
|
||||
value="{% trans '授权登录' %}"
|
||||
value="{% trans '登录/注册' %}"
|
||||
id="loginButton"
|
||||
disabled />
|
||||
</div>
|
||||
|
|
Loading…
Add table
Reference in a new issue