mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-06 00:49:35 +00:00
dfdc473cef
* move finger to dereferencer * totally break GetRemoteAccount * start reworking finger func a bit * start reworking getRemoteAccount a bit * move mention parts to namestring * rework webfingerget * use util function to extract webfinger parts * use accountDomain * rework finger again, final form * just a real nasty commit, the worst * remove refresh from account * use new ASRepToAccount signature * fix incorrect debug call * fix for new getRemoteAccount * rework GetRemoteAccount * start updating tests to remove repetition * break a lot of tests Move shared test logic into the testrig, rather than having it scattered all over the place. This allows us to just mock the transport controller once, and have all tests use it (unless they need not to for some other reason). * fix up tests to use main mock httpclient * webfinger only if necessary * cheeky linting with the lads * update mentionName regex recognize instance accounts * don't finger instance accounts * test webfinger part extraction * increase default worker count to 4 per cpu * don't repeat regex parsing * final search for discovered accountDomain * be more permissive in namestring lookup * add more extraction tests * simplify GetParseMentionFunc * skip long search if local account * fix broken test
59 lines
1.9 KiB
Go
59 lines
1.9 KiB
Go
/*
|
|
GoToSocial
|
|
Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Affero General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Affero General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
package util
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/superseriousbusiness/gotosocial/internal/regexes"
|
|
)
|
|
|
|
// ExtractNamestringParts extracts the username test_user and
|
|
// the domain example.org from a string like @test_user@example.org.
|
|
//
|
|
// If nothing is matched, it will return an error.
|
|
func ExtractNamestringParts(mention string) (username, host string, err error) {
|
|
matches := regexes.MentionName.FindStringSubmatch(mention)
|
|
switch len(matches) {
|
|
case 2:
|
|
return matches[1], "", nil
|
|
case 3:
|
|
return matches[1], matches[2], nil
|
|
default:
|
|
return "", "", fmt.Errorf("couldn't match mention %s", mention)
|
|
}
|
|
}
|
|
|
|
// ExtractWebfingerParts returns username test_user and
|
|
// domain example.org from a string like acct:test_user@example.org,
|
|
// or acct:@test_user@example.org.
|
|
//
|
|
// If nothing is extracted, it will return an error.
|
|
func ExtractWebfingerParts(webfinger string) (username, host string, err error) {
|
|
// remove the acct: prefix if it's present
|
|
webfinger = strings.TrimPrefix(webfinger, "acct:")
|
|
|
|
// prepend an @ if necessary
|
|
if webfinger[0] != '@' {
|
|
webfinger = "@" + webfinger
|
|
}
|
|
|
|
return ExtractNamestringParts(webfinger)
|
|
}
|