- Clean up some logging - Properly store likes in db
This commit is contained in:
parent
c7f875a9c5
commit
03ca524c99
12 changed files with 222 additions and 44 deletions
|
@ -421,11 +421,6 @@ func ImportRemoteAccountByAPUrl(apUrl string) (*models.User, error) {
|
|||
}
|
||||
defer response.Body.Close()
|
||||
body, _ := io.ReadAll(response.Body)
|
||||
log.Debug().
|
||||
Int("status", response.StatusCode).
|
||||
Bytes("body", body).
|
||||
// Any("headers", response.Header).
|
||||
Msg("Response information")
|
||||
if response.StatusCode != 200 {
|
||||
return nil, fmt.Errorf("activitypub: invalid status code: %v", response.StatusCode)
|
||||
}
|
||||
|
@ -452,9 +447,20 @@ func ImportRemoteAccountByAPUrl(apUrl string) (*models.User, error) {
|
|||
Preload(dbgen.User.InfoFields).
|
||||
Preload(dbgen.User.BeingTypes).
|
||||
Preload(dbgen.User.Roles).
|
||||
FirstOrCreate()
|
||||
if err != nil {
|
||||
return nil, other.Error("activitypub", "failed to find or create user in db", err)
|
||||
First()
|
||||
switch err {
|
||||
case nil:
|
||||
case gorm.ErrRecordNotFound:
|
||||
user = &models.User{
|
||||
ID: shared.NewId(),
|
||||
Username: data.PreferredUsername + "@" + targetUrl.Host,
|
||||
ServerId: hostId,
|
||||
}
|
||||
if err = dbgen.User.Select(dbgen.User.ID, dbgen.User.Username, dbgen.User.ServerId).Create(user); err != nil {
|
||||
return nil, other.Error("activitypub", "failed to create user", err)
|
||||
}
|
||||
default:
|
||||
return nil, other.Error("activitypub", "failed to find user", err)
|
||||
}
|
||||
user.Verified = true
|
||||
user.FinishedRegistration = true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue