bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare hosts in findAccountByUsername, fixes #730

Browse source
This commit is contained in:
Alex Gleason 2021-10-07 14:43:14 -05:00
parent 079736e199
commit c3da48ebf4
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/soapbox/selectors/index.js
View file

@ -47,14 +47,36 @@ export const makeGetAccount = () => {
});
};
export const findAccountByUsername = (state, username) => {
const findAccountsByUsername = (state, username) => {
const accounts = state.get('accounts');
return accounts.find(account => {
return accounts.filter(account => {
return username.toLowerCase() === account.getIn(['acct'], '').toLowerCase();
});
};
export const findAccountByUsername = (state, username) => {
const accounts = findAccountsByUsername(state, username);
if (accounts.size > 1) {
const me = state.get('me');
const meURL = state.getIn(['accounts', me, 'url']);
return accounts.find(account => {
try {
// If more than one account has the same username, try matching its host
const { host } = new URL(account.get('url'));
const { host: meHost } = new URL(meURL);
return host === meHost;
} catch {
return false;
}
});
} else {
return accounts.first();
}
};
const toServerSideType = columnType => {
switch (columnType) {
case 'home':