Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #780 from amyspark/find-pleroma-accounts 

Improve searching accounts with Pleroma/MastoFE
This commit is contained in:
AkiraFukushima 2018-12-14 08:55:09 +09:00 committed by GitHub
parent 2bbb607c54 1eca141381
commit 55cb48a0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js
View File

@ -40,12 +40,16 @@ const AccountProfile = {
rootState.TimelineSpace.account.accessToken,
rootState.TimelineSpace.account.baseURL + '/api/v1'
)
return client.get('/search', { q: parsedAccount.acct, resolve: true })
return client.get('/search', { q: parsedAccount.url, resolve: true })
.then(res => {
if (res.data.accounts.length <= 0) throw new AccountNotFound('empty result')
const account = res.data.accounts.find(a => `@${a.acct}` === parsedAccount.acct)
if (account) return account
const user = res.data.accounts.find(a => `@${a.username}@${rootState.TimelineSpace.account.domain}` === parsedAccount.acct)
const pleromaUser = res.data.accounts.find(a => a.acct === parsedAccount.acct)
if (pleromaUser) return pleromaUser
const localUser = res.data.accounts.find(a => `@${a.username}@${rootState.TimelineSpace.account.domain}` === parsedAccount.acct)
if (localUser) return localUser
const user = res.data.accounts.find(a => a.url === parsedAccount.url)
if (!user) throw new AccountNotFound('not found')
return user
})

10
src/renderer/utils/tootParser.js
View File

@ -36,8 +36,12 @@ export function parseTag (tagURL) {
export function findAccount (target, parentClass = 'toot') {
if (target.getAttribute('class') && target.getAttribute('class').includes('u-url')) {
if (target.href && target.href.match(/^https:\/\/[a-zA-Z0-9-.]+\/users\/[a-zA-Z0-9-_.]+/)) {
return parsePleromaAccount(target.href)
} else {
return parseMastodonAccount(target.href)
}
}
// In Pleroma, link does not have class.
// So we have to check URL.
if (target.href && target.href.match(/^https:\/\/[a-zA-Z0-9-.]+\/@[a-zA-Z0-9-_.]+/)) {
@ -62,7 +66,8 @@ export function parseMastodonAccount (accountURL) {
const accountName = res[2]
return {
username: accountName,
acct: `${accountName}@${domainName}`
acct: `${accountName}@${domainName}`,
url: accountURL
}
}
@ -72,6 +77,7 @@ export function parsePleromaAccount (accountURL) {
const accountName = res[2]
return {
username: `@${accountName}`,
acct: `@${accountName}@${domainName}`
acct: `@${accountName}@${domainName}`,
url: accountURL
}
}