Avoid adding duplicate keys to the message attributes about labs-countervandalism-cvnbot HOT 4 CLOSED

This still causes exceptions to be logged to #cvn-broadcast from time to time.

CVNBot14: *DD/1.0*ERROR*ReactorException*Key duplication when adding: watchword*#commons.wikimedia [[Special:Log/upload]] upload * Ludvonga *  uploaded "[[File:Malolotja.jpg]]": {{Information |Description    ={{en|1=Malolotja Nature Reserve - Frokostudsigt}} |Source         =https://www.flickr.com/photos/shevy_dk/5703043684 |Author         =René C. Nielsen |Date           =2011-05-05 |Permission     = |oth

from labs-countervandalism-cvnbot.

A better fix would be to fix the logic problem in cases like the below:

                    // Check if the edit summary matches BES
                    listMatch ubes2 = listman.matchesList(r.comment, 20);
                    if (ubes2.Success)
                    {
                        attribs.Add("watchword", ubes2.matchedItem);
                        attribs.Add("lmreason", ubes2.matchedReason);
                        uMsg = 95620;
                    }

                    // Now check if the title matches BES
                    listMatch ubes1 = listman.matchesList(r.title, 20);
                    if (ubes1.Success)
                    {
                        attribs.Add("watchword", ubes1.matchedItem);
                        attribs.Add("lmreason", ubes1.matchedReason);
                        uMsg = 95620;
                    }

There are bound to be cases where a watchword occurs in both the title and the edit summary (for example), or for an edit to match both an edit-summary watchword and e.g. a "bad user name" pattern.

In those cases the end result is that the last match wins. As such, we should reverse these code blocks for the most important (winning match) to happen first instead last, and then either return early or place the rest in an "else" block so that they don't happen and thus we don't try to add attributes for messages we no longer use.

Doing so would also avoid conflicts where e.g. we match A first and add a few attributes and set uMsg, but then match something else and end up overwriting some attributes (triggers the warning), but also leaving behind unrelated ones.

from labs-countervandalism-cvnbot.

Still seen:

CVNBot14> DD/1.0ERRORReactorExceptionItem has already been added. Key in dictionary: 'watchword' Key being added: 'watchword'#commons.wikimedia [[Special:Log/upload]] upload * Lyokoï * uploaded "[[File:LL-Q150 (fra)-Lyokoï-foutre la merde.wav]]"

from labs-countervandalism-cvnbot.

Re-closing. Assumed fixed in master, but wasn't deployed yet. See #50.

from labs-countervandalism-cvnbot.