Skip to content

Commit 8c1b0bc

Browse files
committed
Remove RichMessageBase which cause Messenger doesn't work.
1 parent 2cd5337 commit 8c1b0bc

File tree

11 files changed

+19
-36
lines changed

11 files changed

+19
-36
lines changed

src/Infrastructure/BotSharp.Abstraction/Messaging/IRichMessage.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ namespace BotSharp.Abstraction.Messaging;
22

33
public interface IRichMessage
44
{
5-
string Type { get; }
65
string Text { get; set; }
76
}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyMessage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace BotSharp.Abstraction.Messaging.Models.RichContent
22
{
3-
public class QuickReplyMessage : RichMessageBase, IRichMessage
3+
public class QuickReplyMessage : IRichMessage
44
{
5-
public override string Type => "quick reply";
5+
public string Text { get; set; } = string.Empty;
66

77
[JsonPropertyName("quick_replies")]
88
public List<QuickReplyElement> QuickReplies { get; set; } = new List<QuickReplyElement>();

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
33
/// <summary>
44
/// https://developers.facebook.com/docs/messenger-platform/send-messages/buttons
55
/// </summary>
6-
public class ButtonTemplateMessage : RichMessageBase, IRichMessage, ITemplateMessage
6+
public class ButtonTemplateMessage : IRichMessage
77
{
8-
public override string Type => "template";
8+
public string Text { get; set; } = string.Empty;
99

1010
[JsonPropertyName("template_type")]
11-
public override string TemplateType => "button";
11+
public string TemplateType => "button";
1212
public List<ButtonElement> Buttons { get; set; } = new List<ButtonElement>();
1313
}
1414

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/CouponTemplateMessage.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
44
/// Coupon Template
55
/// https://developers.facebook.com/docs/messenger-platform/send-messages/template/coupon
66
/// </summary>
7-
public class CouponTemplateMessage : RichMessageBase, IRichMessage, ITemplateMessage
7+
public class CouponTemplateMessage : IRichMessage, ITemplateMessage
88
{
9-
public override string Type => "template";
10-
11-
[JsonPropertyName("template_type")]
12-
public override string TemplateType => "coupon";
13-
149
[JsonIgnore]
15-
public override string Text { get; set; }
10+
public string Text { get; set; }
1611
public string Title { get; set; }
1712
public string Subtitle { get; set; }
1813

14+
[JsonPropertyName("template_type")]
15+
public string TemplateType => "coupon";
16+
1917
[JsonPropertyName("coupon_code")]
2018
public string CouponCode { get; set; }
2119

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
22
{
3-
public class MultiSelectTemplateMessage : RichMessageBase, IRichMessage
3+
public class MultiSelectTemplateMessage : IRichMessage
44
{
5-
public override string Type => "template";
5+
public string Text { get; set; } = string.Empty;
66

77
[JsonPropertyName("template_type")]
88
public string TemplateType => "multi-select";
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
22
{
3-
public class TemplateMessageBase<T> : RichMessageBase
3+
public class TemplateMessageBase<T>
44
{
55
[JsonIgnore]
66
public string Text { get; set; }
77

8-
public override string Type => "template";
9-
108
[JsonPropertyName("template_type")]
119
public virtual string TemplateType => string.Empty;
12-
1310
public T[] Elements { get; set; }
1411
}
1512
}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/TextMessage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace BotSharp.Abstraction.Messaging.Models.RichContent;
22

3-
public class TextMessage : RichMessageBase, IRichMessage
3+
public class TextMessage : IRichMessage
44
{
5-
public string Type => "text";
5+
public string Text { get; set; } = string.Empty;
66

77
public TextMessage(string text)
88
{

src/Infrastructure/BotSharp.Abstraction/Messaging/RichMessageBase.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using BotSharp.Abstraction.Messaging;
2+
using BotSharp.Abstraction.Messaging.Models.RichContent;
23
using Microsoft.AspNetCore.SignalR;
34

45
namespace BotSharp.Plugin.ChatHub.Hooks;
@@ -24,7 +25,7 @@ public override async Task OnUserAgentConnectedInitially(Conversation conversati
2425
var welcomeTemplate = agent.Templates.FirstOrDefault(x => x.Name == "welcome");
2526
if (welcomeTemplate != null)
2627
{
27-
var messages = JsonSerializer.Deserialize<RichMessageBase[]>(welcomeTemplate.Content, new JsonSerializerOptions
28+
var messages = JsonSerializer.Deserialize<TextMessage[]>(welcomeTemplate.Content, new JsonSerializerOptions
2829
{
2930
PropertyNameCaseInsensitive = true
3031
});

src/Plugins/BotSharp.Plugin.MetaMessenger/MessagingModels/AttachmentMessage.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ public class AttachmentMessage : IRichMessage
1010

1111
[JsonPropertyName("attachment")]
1212
public AttachmentBody Attachment { get; set; }
13-
14-
public string Type => "template";
1513
}

0 commit comments

Comments
 (0)