Drop feeds/merge them into user

storage-new/self.go

@@ -43,9 +43,6 @@ func InsertSelf() error {
 	if err = attachUserToRole(user); err != nil {
 		return other.Error("storage", "failed to save/update self user to full admin role", err)
 	}
-	if err = insertGlobalFeed(user); err != nil {
-		return other.Error("storage", "failed to ensure that the global feed exists", err)
-	}
 	return nil
 }
 
@@ -218,26 +215,3 @@ func attachUserToRole(user *models.User) error {
 	}
 	return nil
 }
-
-func insertGlobalFeed(serverActor *models.User) error {
-	globalFeed, err := dbgen.Feed.Where(dbgen.Feed.Name.Eq(models.GlobalFeedName)).First()
-	switch err {
-	case nil:
-		return nil
-	case gorm.ErrRecordNotFound:
-		globalFeed = &models.Feed{
-			Owner:     *serverActor,
-			OwnerId:   serverActor.ID,
-			IsDefault: true,
-			Name:      models.GlobalFeedName,
-			PublicKey: sql.NullString{Valid: false},
-		}
-		err = dbgen.Feed.Create(globalFeed)
-		if err != nil {
-			return err
-		}
-		return nil
-	default:
-		return err
-	}
-}