Merge branch 'master' into dev
This commit is contained in:
		
						commit
						ea89d9d9cd
					
				@ -322,8 +322,7 @@ let handleJpegEvents _ (event : ComponentInteractionCreateEventArgs) =
 | 
				
			|||||||
    let storeId = id.Split("-").[2]
 | 
					    let storeId = id.Split("-").[2]
 | 
				
			||||||
    match id with
 | 
					    match id with
 | 
				
			||||||
    | id when id.StartsWith("Buy") -> handleBuyItem ctx itemId
 | 
					    | id when id.StartsWith("Buy") -> handleBuyItem ctx itemId
 | 
				
			||||||
    | id when id.StartsWith("ShowJpegStore") -> buy storeId None ctx
 | 
					    | id when id.StartsWith("ShowStore") -> buy storeId None ctx
 | 
				
			||||||
    | id when id.StartsWith("ShowRaffleStore") -> buy storeId None ctx
 | 
					 | 
				
			||||||
    | id when id.StartsWith("ShowJpegInventory") -> showJpegsEmbed ctx
 | 
					    | id when id.StartsWith("ShowJpegInventory") -> showJpegsEmbed ctx
 | 
				
			||||||
    | _ ->
 | 
					    | _ ->
 | 
				
			||||||
        task {
 | 
					        task {
 | 
				
			||||||
@ -362,10 +361,11 @@ let sendBackalleyEmbed (ctx : IDiscordContext)  =
 | 
				
			|||||||
            embed.Color <- DiscordColor.Black
 | 
					            embed.Color <- DiscordColor.Black
 | 
				
			||||||
            embed.Description <- "Hey, what do you want kid?"
 | 
					            embed.Description <- "Hey, what do you want kid?"
 | 
				
			||||||
            builder.AddEmbed embed |> ignore
 | 
					            builder.AddEmbed embed |> ignore
 | 
				
			||||||
            let button1 = DiscordButtonComponent(ButtonStyle.Success, $"ShowJpegStore-0-BACKALLEY1", $"NFT Raffles") :> DiscordComponent
 | 
					            let button1 = DiscordButtonComponent(ButtonStyle.Success, $"ShowStore-0-BACKALLEY1", $"NFT Raffles") :> DiscordComponent
 | 
				
			||||||
            let button2 = DiscordButtonComponent(ButtonStyle.Success, $"ShowRaffleStore-0-BACKALLEY2", $"USDT Raffles") :> DiscordComponent
 | 
					            let button2 = DiscordButtonComponent(ButtonStyle.Success, $"ShowStore-0-BACKALLEY2", $"Whitelist Raffles") :> DiscordComponent
 | 
				
			||||||
            let button3 = DiscordButtonComponent(ButtonStyle.Primary, $"ShowJpegInventory-0-0", $"View My Stash") :> DiscordComponent
 | 
					            let button3 = DiscordButtonComponent(ButtonStyle.Success, $"ShowStore-0-BACKALLEY3", $"USDT Raffles") :> DiscordComponent
 | 
				
			||||||
            builder.AddComponents [| button1 ; button2 ; button3 |] |> ignore
 | 
					            let button4 = DiscordButtonComponent(ButtonStyle.Primary, $"ShowJpegInventory-0-0", $"View My Stash") :> DiscordComponent
 | 
				
			||||||
 | 
					            builder.AddComponents [| button1 ; button2 ; button3 ; button4 |] |> ignore
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            do! GuildEnvironment.botClientJpeg.Value.SendMessageAsync(channel, builder)
 | 
					            do! GuildEnvironment.botClientJpeg.Value.SendMessageAsync(channel, builder)
 | 
				
			||||||
                |> Async.AwaitTask
 | 
					                |> Async.AwaitTask
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user