Refactor Karma and Thanks to simplify and avoid exploits

DiscordBot/Extensions/StringExtensions.cs

@@ -103,7 +103,7 @@
 
     public static string GetSha256(this string input)
     {
         var hash = new SHA256CryptoServiceProvider();
         // Convert the input string to a byte array and compute the hash.
         var data = hash.ComputeHash(Encoding.UTF8.GetBytes(input));
 
@@ -161,4 +161,18 @@
 		}
 		return sb.ToString();
 	}
+
+    public static string ToBold(this string text)
+    {
+        return $"**{text}**";
+    }
+
+    public static string[] ToBoldArray(this string[] texts)
+    {
+        var bolds = new string[texts.Length];
+        for (int i = 0; i < texts.Length; i++)
+            bolds[i] = texts[i].ToBold();
+        return bolds;
+    }
+
 }

DiscordBot/Modules/ModerationModule.cs

@@ -125,7 +125,8 @@ await botCommandChannel.SendMessageAsync(
         await UserService.MutedUsers.AwaitCooldown(u.Id);
 
         await UnmuteUser(user, true);
-        reply?.DeleteAsync();
+        if (reply != null)
+            await reply.DeleteAsync();
     }
 
     [Command("Unmute")]
@@ -493,7 +494,7 @@ public async Task ChannelTags(ulong channelId)
             .WithColor(Color.Blue)
             .Build();
 
-        Context.Message.DeleteAsync();
+        await Context.Message.DeleteAsync();
         await ReplyAsync(embed: embed).DeleteAfterSeconds(seconds: 60);
     }
 
@@ -511,4 +512,4 @@ public async Task ModerationHelp()
         }
     }
     #endregion
-}
+}

DiscordBot/Services/UserService.cs

@@ -96,11 +96,12 @@
         */
         var sbThanks = new StringBuilder();
         var thx = userSettings.Thanks;
-        sbThanks.Append("(?i)\\b(");
-        foreach (var t in thx) sbThanks.Append(t).Append("|");
-
+        sbThanks.Append(@"(?i)(?<!\bno\s*)\b(");
+        foreach (var t in thx)
+            sbThanks.Append(t).Append('|');
         sbThanks.Length--; //Efficiently remove the final pipe that gets added in final loop, simplifying loop
-        sbThanks.Append(")\\b");
+        sbThanks.Append(@")\b");
+
         _thanksRegex = sbThanks.ToString();
         _thanksCooldownTime = userSettings.ThanksCooldown;
         _thanksMinJoinTime = userSettings.ThanksMinJoinTime;
@@ -206,7 +207,7 @@
         _updateService.SetUserData(data);
     }
 
     public async Task UpdateXp(SocketMessage messageParam)
     {
         if (messageParam.Author.IsBot)
             return;
@@ -224,7 +225,7 @@
 
         // Add Delay and delay action by 200ms to avoid some weird database collision?
         _xpCooldown.AddCooldown(userId, waitTime);
         Task.Run(async () =>
         {
             var user = await _databaseService.GetOrAddUser((SocketGuildUser)messageParam.Author);
             if (user == null)
@@ -274,7 +275,8 @@
         if (level <= 3)
             return;
 
-        await messageParam.Channel.SendMessageAsync($"**{messageParam.Author.GetUserPreferredName()}** has leveled up!").DeleteAfterTime(60);
+        var msg = messageParam.Author.GetUserPreferredName().ToBold() + " has leveled up!";
+        await messageParam.Channel.SendMessageAsync(msg).DeleteAfterTime(60);
         //TODO Add level up card
     }
 
@@ -434,7 +436,7 @@
     {
         if (_canEditThanks.Contains(messageParam.Id)) await Thanks(messageParam);
     }
-
+    
     public async Task Thanks(SocketMessage messageParam)
     {
         //Get guild id
@@ -449,9 +451,11 @@
         var match = Regex.Match(messageParam.Content, _thanksRegex);
         if (!match.Success)
             return;
-        var mentions = messageParam.MentionedUsers;
-        mentions = mentions.Distinct().ToList();
+
         var userId = messageParam.Author.Id;
+        var mentions = messageParam.MentionedUsers;
+        mentions = mentions.Distinct().Where(who => !who.IsBot && who.Id != userId).ToList();
+
         const int defaultDelTime = 120;
         if (mentions.Count > 0)
         {
@@ -473,46 +477,22 @@
                 return;
             }
 
-            var mentionedSelf = false;
-            var mentionedBot = false;
             var sb = new StringBuilder();
-            sb.Append("**").Append(messageParam.Author.GetUserPreferredName()).Append("** gave karma to **");
-            foreach (var user in mentions)
-            {
-                if (user.IsBot)
-                {
-                    mentionedBot = true;
-                    continue;
-                }
-
-                if (user.Id == userId)
-                {
-                    mentionedSelf = true;
-                    continue;
-                }
-
-                await _databaseService.Query.IncrementKarma(user.Id.ToString());
-                sb.Append(user.GetUserPreferredName()).Append("**, **");
-            }
+            sb.Append(messageParam.Author.GetUserPreferredName().ToBold());
+            sb.Append(" gave karma to ");
+            sb.Append(mentions.ToArray().ToUserPreferredNameArray().ToBoldArray().ToCommaList());
+            foreach (var mention in mentions)
+                await _databaseService.Query.IncrementKarma(mention.Id.ToString());
 
-            // Even if a user gives multiple karma in one message, we only add one.
+            // Even if a user gives multiple karma in one message, we only give one credit.
             var authorKarmaGiven = await _databaseService.Query.GetKarmaGiven(messageParam.Author.Id.ToString());
             await _databaseService.Query.UpdateKarmaGiven(messageParam.Author.Id.ToString(), authorKarmaGiven + 1);
 
-            sb.Length -= 4; //Removes last instance of appended comma/startbold without convoluted tracking
-            //sb.Append("**"); // Already appended an endbold
             sb.Append(".");
-            if (mentionedSelf)
-                await messageParam.Channel.SendMessageAsync(
-                    $"{messageParam.Author.Mention} you can't give karma to yourself.").DeleteAfterTime(defaultDelTime);
 
             _canEditThanks.Remove(messageParam.Id);
-
-            //Don't give karma cooldown if user only mentioned himself or the bot or both
-            if ((mentionedSelf || mentionedBot) && mentions.Count == 1 ||
-                mentionedBot && mentionedSelf && mentions.Count == 2)
-                return;
             _thanksCooldown.AddCooldown(userId, _thanksCooldownTime);
+
             await messageParam.Channel.SendMessageAsync(sb.ToString());
             await _loggingService.LogChannelAndFile(sb + " in channel " + messageParam.Channel.Name);
         }
@@ -735,7 +715,7 @@
                 await _loggingService.LogAction($"{ServiceName}: Welcome service failed on first run!? This should not happen.", ExtendedLogSeverity.Error);
 
             // Run the service again.
             Task.Run(DelayedWelcomeService);
         }
     }
 

DiscordBot/Settings/Deserialized/Settings.cs

@@ -106,6 +106,8 @@ public class BotSettings
     public ulong SubsNewsRoleId { get; set; }
     public ulong PublisherRoleId { get; set; }
     public ulong ModeratorRoleId { get; set; }
+    public ulong TipsUserRoleId { get; set; } // e.g., Helpers
+    public ulong TipsAuthorRoleId { get; set; } // e.g., Moderators
 
     #endregion // User Roles
 

DiscordBot/Utils/WebUtil.cs

@@ -38,7 +38,7 @@ public static async Task<HtmlDocument> GetHtmlDocument(string url)
             doc.LoadHtml(html);
             return doc;
         }
-        catch (Exception e)
+        catch (Exception)
         {
             return null;
         }
@@ -55,7 +55,7 @@ public static async Task<HtmlNode> GetHtmlNode(string url, string xpath)
             var doc = await GetHtmlDocument(url);
             return doc.DocumentNode.SelectSingleNode(xpath);
         }
-        catch (Exception e)
+        catch (Exception)
         {
             return null;
         }
@@ -71,7 +71,7 @@ public static async Task<HtmlNodeCollection> GetHtmlNodes(string url, string xpa
             var doc = await GetHtmlDocument(url);
             return doc.DocumentNode.SelectNodes(xpath);
         }
-        catch (Exception e)
+        catch (Exception)
         {
             return null;
         }
@@ -87,7 +87,7 @@ public static async Task<string> GetHtmlNodeInnerText(string url, string xpath)
             var node = await GetHtmlNode(url, xpath);
             return WebUtility.HtmlDecode(node?.InnerText);
         }
-        catch (Exception e)
+        catch (Exception)
         {
             return string.Empty;
         }
@@ -147,4 +147,4 @@ public static async Task<T> GetObjectFromJson<T>(string url)
             return (false, default);
         }
     }
-}
+}