mirror of
https://github.com/Jetsparrow/karmabot.git
synced 2026-01-21 00:56:09 +03:00
rework AwardCommand and StartCommand
This commit is contained in:
parent
7ea5b180cb
commit
990b85e5f9
@ -11,31 +11,34 @@ namespace JetKarmaBot.Commands
|
|||||||
{
|
{
|
||||||
class AwardCommand : IChatCommand
|
class AwardCommand : IChatCommand
|
||||||
{
|
{
|
||||||
public IReadOnlyCollection<string> Names => new[] { "award"};
|
public IReadOnlyCollection<string> Names => new[] { "award", "revoke"};
|
||||||
|
|
||||||
public bool Execute(object sender, MessageEventArgs args)
|
public bool Execute(object sender, MessageEventArgs args)
|
||||||
{
|
{
|
||||||
//var mentions = args.Message.Entities.Where(e => e.Type == MessageEntityType.Mention).ToArray();
|
if (args.Message.ReplyToMessage == null)
|
||||||
if (args.Message.ReplyToMessage == null)// && !mentions.Any())
|
|
||||||
{
|
{
|
||||||
Client.SendTextMessageAsync(args.Message.Chat.Id, "Please use this command in reply to another user, or use a mention.");
|
Client.SendTextMessageAsync(args.Message.Chat.Id, "Please use this command in reply to another user.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
var awarder = args.Message.From;
|
var awarder = args.Message.From;
|
||||||
//var members = Client.get(,).Result;
|
|
||||||
//var recipient = mentions.FirstOrDefault()?.User ?? args.Message.ReplyToMessage.From;
|
|
||||||
var recipient = args.Message.ReplyToMessage.From;
|
var recipient = args.Message.ReplyToMessage.From;
|
||||||
|
|
||||||
if (awarder.Id == recipient.Id)
|
if (awarder.Id == recipient.Id)
|
||||||
{
|
{
|
||||||
Client.SendTextMessageAsync(args.Message.Chat.Id, "Please stop playing with yourself.");
|
Client.SendTextMessageAsync(
|
||||||
|
args.Message.Chat.Id,
|
||||||
|
"Please stop playing with yourself.",
|
||||||
|
replyToMessageId: args.Message.MessageId);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Me.Id == recipient.Id)
|
if (Me.Id == recipient.Id)
|
||||||
{
|
{
|
||||||
Client.SendTextMessageAsync(args.Message.Chat.Id, "I am a bot, and have no use for your foolish fake internet points.");
|
Client.SendTextMessageAsync(
|
||||||
|
args.Message.Chat.Id,
|
||||||
|
"I am a bot, and have no use for your foolish fake internet points.",
|
||||||
|
replyToMessageId: args.Message.MessageId);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -43,13 +46,19 @@ namespace JetKarmaBot.Commands
|
|||||||
var command = CommandString.Parse(text);
|
var command = CommandString.Parse(text);
|
||||||
var awardTypeId = Db.GetAwardTypeId(command.Parameters.FirstOrDefault());
|
var awardTypeId = Db.GetAwardTypeId(command.Parameters.FirstOrDefault());
|
||||||
var awardType = Db.AwardTypes[awardTypeId];
|
var awardType = Db.AwardTypes[awardTypeId];
|
||||||
Db.AddAward(awardTypeId, awarder.Id, recipient.Id, args.Message.Chat.Id);
|
|
||||||
|
Db.AddAward(awardTypeId, awarder.Id, recipient.Id, args.Message.Chat.Id, 1);
|
||||||
|
|
||||||
var response = $"Awarded a {awardType.Name} to {recipient.Username}!\n" +
|
var response = $"Awarded a {awardType.Name} to {recipient.Username}!\n" +
|
||||||
$"{recipient.Username} is at {Db.CountAwards(recipient.Id, awardTypeId)}{awardType.Symbol} now.";
|
$"{recipient.Username} is at {Db.CountAwards(recipient.Id, awardTypeId)}{awardType.Symbol} now.";
|
||||||
Client.SendTextMessageAsync(args.Message.Chat.Id, response);
|
Client.SendTextMessageAsync(
|
||||||
|
args.Message.Chat.Id,
|
||||||
|
response,
|
||||||
|
replyToMessageId: args.Message.MessageId);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Db Db { get; }
|
Db Db { get; }
|
||||||
TelegramBotClient Client { get; }
|
TelegramBotClient Client { get; }
|
||||||
User Me { get; }
|
User Me { get; }
|
||||||
|
|||||||
@ -5,17 +5,19 @@ namespace JetKarmaBot.Commands
|
|||||||
{
|
{
|
||||||
public class StartCommand : IChatCommand
|
public class StartCommand : IChatCommand
|
||||||
{
|
{
|
||||||
Db m_db;
|
Db Db;
|
||||||
|
|
||||||
public StartCommand(Db db)
|
public StartCommand(Db db)
|
||||||
{
|
{
|
||||||
m_db = db;
|
Db = db;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IReadOnlyCollection<string> Names => new[] { "start" };
|
public IReadOnlyCollection<string> Names => new[] { "start" };
|
||||||
|
|
||||||
public bool Execute(object sender, MessageEventArgs args)
|
public bool Execute(object sender, MessageEventArgs args)
|
||||||
{
|
{
|
||||||
m_db.AddChat(new Db.Chat { ChatId = args.Message.Chat.Id });
|
Db.AddChat(new Db.Chat { ChatId = args.Message.Chat.Id });
|
||||||
m_db.AddUser(new Db.User { UserId = args.Message.From.Id });
|
Db.AddUser(new Db.User { UserId = args.Message.From.Id });
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user