Merge branch 'master' into flutter_app

scnserver/api/handler/apiChannel.go

@@ -180,6 +180,8 @@ func (h APIHandler) CreateChannel(g *gin.Context) ginresp.HTTPResponse {
 	type body struct {
 		Name      string `json:"name"`
 		Subscribe *bool  `json:"subscribe"`
+
+		Description *string `json:"description"`
 	}
 
 	var u uri
@@ -233,7 +235,7 @@ func (h APIHandler) CreateChannel(g *gin.Context) ginresp.HTTPResponse {
 
 	subscribeKey := h.app.GenerateRandomAuthKey()
 
-	channel, err := h.database.CreateChannel(ctx, u.UserID, channelDisplayName, channelInternalName, subscribeKey)
+	channel, err := h.database.CreateChannel(ctx, u.UserID, channelDisplayName, channelInternalName, subscribeKey, b.Description)
 	if err != nil {
 		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create channel", err)
 	}

scnserver/config.go

@@ -395,8 +395,8 @@ var configProd = func() Config {
 			EnableLogger:     true,
 		},
 		RequestTimeout:           16 * time.Second,
-		RequestMaxRetry:          8,
+		RequestMaxRetry:          32,
-		RequestRetrySleep:        100 * time.Millisecond,
+		RequestRetrySleep:        32 * time.Millisecond,
 		ReturnRawErrors:          false,
 		DummyFirebase:            false,
 		FirebaseTokenURI:         "https://oauth2.googleapis.com/token",

scnserver/db/impl/primary/channels.go

@@ -58,7 +58,15 @@ func (db *Database) GetChannelByID(ctx db.TxContext, chanid models.ChannelID) (*
 	return &channel, nil
 }
 
-func (db *Database) CreateChannel(ctx db.TxContext, userid models.UserID, dispName string, intName string, subscribeKey string) (models.Channel, error) {
+type CreateChanel struct {
+	UserId       models.UserID
+	DisplayName  string
+	IntName      string
+	SubscribeKey string
+	Description  *string
+}
+
+func (db *Database) CreateChannel(ctx db.TxContext, userid models.UserID, dispName string, intName string, subscribeKey string, description *string) (models.Channel, error) {
 	tx, err := ctx.GetOrCreateTransaction(db)
 	if err != nil {
 		return models.Channel{}, err
@@ -70,6 +78,7 @@ func (db *Database) CreateChannel(ctx db.TxContext, userid models.UserID, dispNa
 		DisplayName:       dispName,
 		InternalName:      intName,
 		SubscribeKey:      subscribeKey,
+		DescriptionName:   description,
 		TimestampCreated:  time2DB(time.Now()),
 		TimestampLastSent: nil,
 		MessagesSent:      0,

scnserver/logic/application.go

@@ -331,7 +331,7 @@ func (app *Application) GetOrCreateChannel(ctx *AppContext, userid models.UserID
 
 	subscribeKey := app.GenerateRandomAuthKey()
 
-	newChan, err := app.Database.Primary.CreateChannel(ctx, userid, displayChanName, intChanName, subscribeKey)
+	newChan, err := app.Database.Primary.CreateChannel(ctx, userid, displayChanName, intChanName, subscribeKey, nil)
 	if err != nil {
 		return models.Channel{}, err
 	}

scnserver/swagger/swagger.json

@@ -3047,6 +3047,9 @@
         "handler.CreateChannel.body": {
             "type": "object",
             "properties": {
+                "description": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },

scnserver/swagger/swagger.yaml

@@ -139,6 +139,8 @@ definitions:
     type: object
   handler.CreateChannel.body:
     properties:
+      description:
+        type: string
       name:
         type: string
       subscribe:

scnserver/test/channel_test.go

@@ -54,6 +54,16 @@ func TestCreateChannel(t *testing.T) {
 		tt.AssertMappedSet(t, "channels", []string{"asdf", "test"}, clist.Channels, "display_name")
 		tt.AssertMappedSet(t, "channels", []string{"asdf", "test"}, clist.Channels, "internal_name")
 	}
+	tt.RequestAuthPost[gin.H](t, admintok, baseUrl, fmt.Sprintf("/api/v2/users/%s/channels", uid), gin.H{
+		"name":        "withdesc",
+		"description": "desc",
+	})
+
+	{
+		clist := tt.RequestAuthGet[chanlist](t, admintok, baseUrl, fmt.Sprintf("/api/v2/users/%s/channels", uid))
+		tt.AssertEqual(t, "chan.len", 3, len(clist.Channels))
+		tt.AssertEqual(t, "description_name", "desc", clist.Channels[2]["description_name"])
+	}
 }
 
 func TestCreateChannelNameTooLong(t *testing.T) {