johnnygear/gear-orders
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More quick fixes

Browse source
This commit is contained in:
Johnny Gear 2026-03-07 11:00:49 -06:00
parent eefdd093b2
commit cb44d35869
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db/models.py
View file

@ -37,7 +37,9 @@ class User(BaseModel):
mastodon_post_public = BooleanField(null=True, default=False) mastodon_post_public = BooleanField(null=True, default=False)
def mastodon_account(self): def mastodon_account(self):
if self.mastodon_server.name == MASTODON_INSTANCE: if self.mastodon_server is None or self.mastodon_username is None:
return
elif self.mastodon_server.name == MASTODON_INSTANCE:
return self.mastodon_username return self.mastodon_username
else: else:
return f"{self.mastodon_username}@{self.mastodon_server}" return f"{self.mastodon_username}@{self.mastodon_server}"

2
web/app.py
View file

@ -140,7 +140,7 @@ def mastodon_oauth():
user_mastodon_user_set(current_user.db_user.id, username, access_token) user_mastodon_user_set(current_user.db_user.id, username, access_token)
return redirect('/profile') return redirect('/profile/')
@app.route('/login') @app.route('/login')
def login(): def login():

5
web/vite/src/Profile.tsx
View file

@ -70,7 +70,10 @@ export const Profile: React.FC = () => {
const [opened, { open, close }] = useDisclosure(false); const [opened, { open, close }] = useDisclosure(false);
const mastodon_account = React.useMemo( const mastodon_account = React.useMemo(
() => `@${mastodon_username}@${mastodon_server}`, () =>
mastodon_username && mastodon_server
? `@${mastodon_username}@${mastodon_server}`
: null,
[mastodon_server, mastodon_username], [mastodon_server, mastodon_username],
); );