Move attachments and comments functions into four separate objects.

Specifically there are objects AttachList, Attachment, Comment,
and CommentList.

8 files changed, 252 insertions, 1190 deletions

diff --git a/data/lib/bug-page-mod.js b/data/lib/bug-page-mod.js
deleted file mode 100644
index 0da1553..0000000
--- a/data/lib/bug-page-mod.js
+++ /dev/null
@@ -1,986 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Bugzilla Tweaks.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnathan Nightingale <johnath@mozilla.com>
- *   Ehsan Akhgari <ehsan@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-function tweakBugzilla(d) {
-    // run on both bugzilla.m.o and bugzilla-stage-tip.m.o
-    if (!onBugzillaPage(d.URL))
-        return;
-
-    // Put the quicksearch text in the quicksearch boxes
-    quicksearchHandler(d);
-
-    if (!d.getElementById("comments")) // don't process the mid-air collision pages
-      return;
-
-    // Make the comment box bigger ... TODO not necessary on RH BZ, but doesn't hurt
-    var commentBox = d.getElementById("comment");
-    if (commentBox)
-        commentBox.rows=20;
-
-    addNewLinks(d);
-
-    attachmentDiffLinkify(d);
-
-    viewAttachmentSource(d);
-
-    // Mark up history along right hand edge
-    // TODO ... not sure what does this mean ... this
-    // <link> element is I suppose everywhere.
-    var historyLink = d.querySelector("link[title='Bug Activity']");
-    if (!historyLink)
-        return;
-
-    // Add our own style for bugzilla-tweaks
-    var style = d.createElement("style");
-    style.setAttribute("type", "text/css");
-    style.appendChild(d.createTextNode(
-        ".bztw_history { border: none; font-weight: normal; width: 58em; margin-left: 5em; }" +
-        ".bztw_inlinehistory { font-weight: normal; width: 56em; }" +
-        ".bztw_history .old, .bztw_inlinehistory .old { text-decoration: line-through; }" +
-        ".bztw_history .sep:before { content: \" \"; }" +
-        ".bztw_unconfirmed { font-style: italic; }" +
-        "tr.bz_tr_obsolete.bztw_plusflag { display: table-row !important; }" +
-        '.bztw_historyitem + .bztw_historyitem:before { content: "; "; }'
-    ));
-    d.getElementsByTagName("head")[0].appendChild(style);
-    style = d.createElement("style");
-    style.setAttribute("type", "text/css");
-    style.id = "bztw_cc";
-    style.appendChild(d.createTextNode(
-        ".bztw_cc { display: none; }" +
-        '.bztw_historyitem.bztw_cc + .bztw_historyitem:before { content: ""; }' +
-        '.bztw_historyitem:not([class~="bztw_cc"]) ~ .bztw_historyitem.bztw_cc + .bztw_historyitem:before { content: "; "; }'
-    ));
-    d.getElementsByTagName("head")[0].appendChild(style);
-
-    var userNameCache = {};
-    function getUserName(email) {
-        if (email in userNameCache) {
-            return userNameCache[email];
-        }
-        var emailLink = d.querySelectorAll("a.email");
-        for (var i = 0; i < emailLink.length; ++i) {
-            if (emailLink[i].href == "mailto:" + email) {
-                return userNameCache[email] = htmlEncode(trimContent(emailLink[i]));
-            }
-        }
-        return email;
-    }
-
-    // collect the flag names
-    var flagNames = [], flags = {}, flagOccurrences = {};
-    var flagRows = d.querySelectorAll("#flags tr");
-    for (var i = 0; i < flagRows.length; ++i) {
-        var item = flagRows[i].querySelectorAll("td");
-        if (!item[1])
-            continue;
-        var name = trimContent(item[1]).replace('\u2011', '-', 'g');
-        flagNames.push(name);
-        flags[name] = item[1];
-    }
-    flagRows = d.querySelectorAll(".field_label[id^=field_label_cf_]");
-    for (var i = 0; i < flagRows.length; ++i) {
-        var name = trimContent(flagRows[i]).replace(/\:$/, '')
-                                           .replace('\u2011', '-', 'g');
-        flagNames.push(name);
-        flags[name] = flagRows[i];
-    }
-    var flagCounter = 1;
-    function findFlag(item) {
-        function lookup(name) {
-            name = name.replace('\u2011', '-', 'g');
-            for (var i = 0; i < flagNames.length; ++i) {
-                var quotedFlagName = flagNames[i].replace('.', '\\.', 'g')
-                                                 .replace('\u2011', '-', 'g');
-                if ((new RegExp('^' + quotedFlagName)).test(name)) {
-                    return [flagNames[i]];
-                }
-            }
-            return [];
-        }
-        var base = item[4] ? 2 : 0;
-        // handle normal flags
-        if (trimContent(item[base]) == 'Flag') {
-            var result = [];
-            var tmp = lookup(trimContent(item[base + 1]));
-            if (tmp.length) {
-                result.push(tmp[0]);
-            }
-            tmp = lookup(trimContent(item[base + 2]));
-            if (tmp.length) {
-                result.push(tmp[0]);
-            }
-            return result;
-        }
-        // handle special pseudo-flags
-        return lookup(trimContent(item[base]));
-    }
-
-    var DataStore = new DataStoreCtor(d);
-
-    var AttachmentFlagHandler = new AttachmentFlagHandlerCtor();
-    AttachmentFlagHandler.determineInterestingFlags(d);
-
-    var CheckinComment = new CheckinCommentCtor();
-    CheckinComment.initialize(d, AttachmentFlagHandler._interestingFlags);
-
-    var iframe = d.createElement('iframe');
-    iframe.src = historyLink.href;
-    iframe.style.display = "none";
-    iframe.addEventListener("load", function() {
-        preprocessDuplicateMarkers(d, iframe.contentDocument);
-
-        var historyItems = iframe.contentDocument.querySelectorAll('#bugzilla-body tr');
-        var commentTimes = d.querySelectorAll('.bz_comment_time');
-
-        // Sometimes the history will stack several changes together,
-        // and we'll want to append the data from the Nth item to the
-        // div created in N-1
-        var i=0, j=0, flagsFound;
-        for (; i < historyItems.length; i++) {
-            var item = historyItems[i].querySelectorAll("td");
-            if (!item[1])
-                continue;
-
-            var reachedEnd = false;
-            for (; j < commentTimes.length; j++) {
-                if (trimContent(item[1]) > trimContent(commentTimes[j])) {
-                    if (j < commentTimes.length - 1) {
-                        continue;
-                    } else {
-                        reachedEnd = true;
-                    }
-                }
-
-                var commentHead = commentTimes[j].parentNode;
-
-                var mainUser = commentHead.querySelector(".bz_comment_user a.email")
-                                          .href
-                                          .substr(7);
-                var user = trimContent(item[0]);
-                var mainTime = trimContent(commentTimes[j]);
-                var time = trimContent(item[1]);
-                var inline = (mainUser == user && time == mainTime);
-
-                var currentDiv = d.createElement("div");
-                var userPrefix = '';
-                if (inline) {
-                    // assume that the change was made by the same user
-                    commentHead.appendChild(currentDiv);
-                    currentDiv.setAttribute("class", "bztw_inlinehistory");
-                } else {
-                    // the change was made by another user
-                    if (!reachedEnd) {
-                        var parentDiv = commentHead.parentNode;
-                        if (parentDiv.previousElementSibling &&
-                            parentDiv.previousElementSibling.className.indexOf("bztw_history") >= 0) {
-                            currentDiv = parentDiv.previousElementSibling;
-                        } else {
-                            parentDiv.parentNode.insertBefore(currentDiv, parentDiv);
-                        }
-                    } else {
-                        var parentDiv = commentHead.parentNode;
-                        if (parentDiv.nextElementSibling &&
-                            parentDiv.nextElementSibling.className.indexOf("bztw_history") >= 0) {
-                            currentDiv = parentDiv.nextElementSibling;
-                        } else {
-                            parentDiv.parentNode.appendChild(currentDiv);
-                        }
-                    }
-                    currentDiv.setAttribute("class", "bz_comment bztw_history");
-                    userPrefix += "<a class=\"email\" href=\"mailto:" +
-                                  htmlEncode(trimContent(item[0])) + "\" title=\"" +
-                                  htmlEncode(trimContent(item[1])) +"\">" +
-                                  getUserName(trimContent(item[0])) + "</a>: ";
-                }
-                // check to see if this is a flag setting
-                flagsFound = findFlag(item);
-                for (var idx = 0; idx < flagsFound.length; ++idx) {
-                    var flag = flagsFound[idx];
-                    flagOccurrences[flag] = 'flag' + flagCounter;
-                    if (inline) {
-                        var anchor = d.createElement("a");
-                        anchor.setAttribute("name", "flag" + flagCounter);
-                        commentHead.insertBefore(anchor, commentHead.firstChild);
-                    } else {
-                        userPrefix += '<a name="flag' + flagCounter + '"></a>';
-                    }
-                    ++flagCounter;
-                }
-
-                var attachmentFlagAnchors = AttachmentFlagHandler.handleItem(user, item);
-                if (inline) {
-                    for (var idx = 0; idx < attachmentFlagAnchors.length; ++idx) {
-                        var anchor = d.createElement("a");
-                        anchor.setAttribute("name", attachmentFlagAnchors[idx]);
-                        commentHead.insertBefore(anchor, commentHead.firstChild);
-                    }
-                } else {
-                    userPrefix += attachmentFlagAnchors.map(function(name) '<a name="' + name + '"></a>').join("");
-                }
-
-                var ccOnly = (trimContent(item[2]) == 'CC');
-                var ccPrefix = ccOnly ? '<span class="bztw_cc bztw_historyitem">' :
-                                        '<span class="bztw_historyitem">',
-                    ccSuffix = '</span>';
-                var html = userPrefix +
-                           ccPrefix +
-                           transformType(trimContent(item[2]), d, trimContent(item[3]),
-                                         trimContent(item[4])) + ": " +
-                           formatTransition(trimContent(item[3]), trimContent(item[4]),
-                                            trimContent(item[2]), d, iframe.contentDocument);
-
-                var nextItemsCount = item[0].rowSpan;
-                for (var k = 1; k < nextItemsCount; ++k) {
-                    ccOnly = false;
-                    item = historyItems[++i].querySelectorAll("td")
-                    ccPrefix = (trimContent(item[0]) == 'CC') ?
-                        '<span class="bztw_cc bztw_historyitem">' : '<span class="bztw_historyitem">';
-                    // avoid showing a trailing semicolon if the previous entry wasn't a CC and this one is
-                    var prefix = ccSuffix + ccPrefix;
-                    // check to see if this is a flag setting
-                    flagsFound = findFlag(item);
-                    for (var idx = 0; idx < flagsFound.length; ++idx) {
-                        var flag = flagsFound[idx];
-                        flagOccurrences[flag] = 'flag' + flagCounter;
-                        if (inline) {
-                            var anchor = d.createElement("a");
-                            anchor.setAttribute("name", "flag" + flagCounter);
-                            commentHead.insertBefore(anchor, commentHead.firstChild);
-                        } else {
-                            prefix += '<a name="flag' + flagCounter + '"></a>';
-                        }
-                        ++flagCounter;
-                    }
-
-                    var attachmentFlagAnchors = AttachmentFlagHandler.handleItem(user, item);
-                    if (inline) {
-                        for (var idx = 0; idx < attachmentFlagAnchors.length; ++idx) {
-                            var anchor = d.createElement("a");
-                            anchor.setAttribute("name", attachmentFlagAnchors[idx]);
-                            commentHead.insertBefore(anchor, commentHead.firstChild);
-                        }
-                    } else {
-                        prefix += attachmentFlagAnchors.map(function(name) '<a name="' + name + '"></a>').join("");
-                    }
-
-                    html += prefix +
-                            transformType(trimContent(item[0]), d, trimContent(item[1]),
-                                          trimContent(item[2])) + ": " +
-                            formatTransition(trimContent(item[1]), trimContent(item[2]),
-                                             trimContent(item[0]), d, iframe.contentDocument);
-                }
-                html += ccSuffix;
-                if (ccOnly) {
-                    html = '<div class="bztw_cc">' + html + '</div>';
-                } else {
-                    html = '<div>' + html + '</div>';
-                }
-                currentDiv.innerHTML += html;
-                break;
-            }
-        }
-
-        handleEmptyCollapsedBoxes(d);
-
-        // Set the latest flag links if necessary
-        for (var flagName in flagOccurrences) {
-            flags[flagName].innerHTML = '<a href="#' + flagOccurrences[flagName] + '">'
-                + flags[flagName].innerHTML + '</a>';
-        }
-
-        AttachmentFlagHandler.setupLinks(d);
-    },true);
-    d.body.appendChild(iframe);
-
-    tbplbotSpamCollapser(d);
-}
-
-var TransformValues = {
-    linkifyURLs: function (str) {
-        return str.replace(/((https?|ftp)\:\/\/[\S]+)/g, '<a href="$1">$1</a>');
-    },
-    linkifyBugAndCommentNumbers: function (str) {
-        return str.replace(/(bug )(\d+) (comment )(\d+)/gi, '<a href="show_bug.cgi?id=$2#c$4">$1\n$2 $3\n$4</a>');
-    },
-    linkifyCommentNumbers: function (str) {
-        return str.replace(/(comment (\d+))/gi, '<a href="#c$2">$1</a>');
-    },
-    linkifyBugNumbers: function (str) {
-        return str.replace(/(bug (\d+))/gi, '<a href="show_bug.cgi?id=$2">$1</a>');
-    },
-    linkifyDependencies: function (str, type, doc, histDoc) {
-        switch (type) {
-        case "Blocks":
-        case "Depends on":
-        case "Duplicate":
-            str = str.replace(/\d+/g, function(str) {
-                var link = histDoc.querySelector("a[href='show_bug.cgi?id=" + str + "']");
-                if (link) {
-                    var class_ = '';
-                    if (/bz_closed/i.test(link.className)) {
-                        class_ += 'bz_closed ';
-                    } else if (/bztw_unconfirmed/i.test(link.className)) {
-                        class_ += 'bztw_unconfirmed ';
-                    }
-                    var parent = link.parentNode;
-                    if (parent) {
-                        if (parent.tagName.toLowerCase() == "i") {
-                            class_ += 'bztw_unconfirmed ';
-                        }
-                        if (/bz_closed/i.test(parent.className)) {
-                            class_ += 'bz_closed ';
-                        }
-                    }
-                    str = applyClass(class_,
-                                     '<a title="' + htmlEncode(link.title) + '" href="show_bug.cgi?id=' + htmlEncode(str) + '"' +
-                                     (link.hasAttribute("name") ? (' name="' + htmlEncode(link.getAttribute("name")) + '"') : '') +
-                                     '>' + htmlEncode(str) + '</a>');
-                }
-                return str;
-            });
-        }
-        return str;
-    }
-};
-
-function transform(str, type, doc, histDoc) {
-    for (var funcname in TransformValues) {
-        var func = TransformValues[funcname];
-        str = func.call(null, str, type, doc, histDoc);
-    }
-    return str
-}
-
-var TransformTypes = {
-    linkifyAttachments: function (str, doc) {
-        return str.replace(/(Attachment #(\d+))/g, function (str, x, id) {
-            var link = doc.querySelector("a[href='attachment.cgi?id=" + id + "']");
-            if (link) {
-                var class_ = '';
-                if (/bz_obsolete/i.test(link.className)) {
-                    class_ += 'bz_obsolete ';
-                }
-                var parent = link.parentNode;
-                if (parent && /bz_obsolete/i.test(parent.className)) {
-                    class_ += 'bz_obsolete ';
-                }
-                if (link.querySelector(".bz_obsolete")) {
-                    class_ += 'bz_obsolete ';
-                }
-                str = applyClass(class_,
-                                 '<a title="' + htmlEncode(trimContent(link)) + '" href="attachment.cgi?id=' +
-                                 htmlEncode(id) + '&action=edit">' + htmlEncode(str) + '</a>');
-            }
-            return str;
-        });
-    },
-    changeDependencyLinkTitles: function (str, doc, old, new_) {
-        switch (str) {
-        case "Blocks":
-        case "Depends on":
-            if (old.length && !new_.length) { // if the dependency was removed
-                str = "No longer " + str[0].toLowerCase() + str.substr(1);
-            }
-            break;
-        }
-        return str;
-    }
-};
-
-function transformType(str, doc, old, new_) {
-    for (var funcname in TransformTypes) {
-        var func = TransformTypes[funcname];
-        str = func.call(null, str, doc, old, new_);
-    }
-    return str;
-}
-
-// new is a keyword, which makes this function uglier than I'd like
-function formatTransition(old, new_, type, doc, histDoc) {
-    if (old.length) {
-        old = transform(htmlEncode(old), type, doc, histDoc);
-        var setOldStyle = true;
-        switch (type) {
-        case "Blocks":
-        case "Depends on":
-            setOldStyle = false;
-            break;
-        }
-        if (setOldStyle) {
-            old = '<span class="old">' + old + '</span>';
-        }
-    }
-    if (new_.length) {
-        new_ = '<span class="new">' + transform(htmlEncode(new_), type, doc, histDoc) + '</span>';
-    }
-    var mid = '';
-    if (old.length && new_.length) {
-        mid = ' <span style="font-size: 150%;">&rArr;</span> ';
-    }
-    return old + mid + new_;
-}
-
-function trimContent(el) {
-    return el.textContent.trim();
-}
-
-function AttachmentFlag(flag) {
-    for (var name in flag)
-        this[name] = flag[name];
-}
-AttachmentFlag.prototype = {
-    equals: function(flag) {
-        if (this.type != flag.type ||
-            this.name != flag.name ||
-            this.setter != flag.setter ||
-            ("requestee" in this && !("requestee" in flag)) ||
-            ("requestee" in flag && !("requestee" in this)))
-            return false;
-        return this.requestee == flag.requestee;
-    }
-};
-
-var reAttachmentDiff = /attachment\.cgi\?id=(\d+)&action=diff$/i;
-var reviewBoardUrlBase = "http://reviews.visophyte.org/";
-
-/**
- * Whenever we find a patch with a diff, insert an additional link to asuth's
- * review board magic.
- */
-function attachmentDiffLinkify(doc) {
-  var bug_id = getBugNo(doc);
-
-  var table = doc.getElementById("attachment_table");
-  if (!table)
-    return;
-  var rows = table.querySelectorAll("tr");
-  for (var i = 0; i < rows.length; ++i) {
-    var item = rows[i].querySelectorAll("td");
-    if (item.length != 3)
-      continue;
-    // get the ID of the attachment
-    var links = item[2].querySelectorAll("a");
-    if (links.length != 2)
-      continue;
-    var match = reAttachmentDiff.exec(links[1].href);
-    if (match) {
-      var attach_id = match[1];
-      var parentNode = links[1].parentNode;
-      parentNode.appendChild(doc.createTextNode(" | "));
-      var linkNode = doc.createElement("a");
-      linkNode.href = reviewBoardUrlBase + "r/bzpatch/bug" + bug_id + "/attach" + attach_id + "/";
-      linkNode.textContent = "Review";
-      parentNode.appendChild(linkNode);
-    }
-  }
-}
-
-function quicksearchHandler(doc) {
-  var win = doc.defaultView;
-  var match = /quicksearch=([^&]+)/i.exec(win.location.search);
-  if (match) {
-    var quicksearch = unescape(match[1].replace('+', ' ', 'g'));
-    var quicksearchBox = doc.querySelectorAll("input[name=quicksearch]");
-    if (quicksearchBox) {
-      for (var i = 0; i < quicksearchBox.length; ++i) {
-        quicksearchBox[i].value = quicksearch;
-      }
-    }
-  }
-}
-
-function AttachmentFlagHandlerCtor() {
-    this._db = {};
-    this._interestingFlags = {};
-}
-AttachmentFlagHandlerCtor.prototype = {
-    determineInterestingFlags: function (doc) {
-        var table = doc.getElementById("attachment_table");
-        if (!table)
-            return;
-        var rows = table.querySelectorAll("tr");
-        for (var i = 0; i < rows.length; ++i) {
-            var item = rows[i].querySelectorAll("td");
-            if (item.length != 3 ||
-                item[1].className.indexOf("bz_attach_flags") < 0 ||
-                trimContent(item[1]) == "no flags")
-                continue;
-            // get the ID of the attachment
-            var link = item[0].querySelector("a");
-            if (!link)
-                continue;
-            var match = this._reAttachmentHref.exec(link.href);
-            if (match) {
-                var attachmentID = match[1];
-                if (!(attachmentID in this._interestingFlags)) {
-                    this._interestingFlags[attachmentID] = [];
-                }
-                for (var el = item[1].firstChild; el.nextSibling; el = el.nextSibling) {
-                    if (el.nodeType != el.TEXT_NODE)
-                        continue;
-                    var text = trimContent(el).replace('\u2011', '-', 'g');
-                    if (!text)
-                        continue;
-                    match = this._reParseInterestingFlag.exec(text);
-                    if (match) {
-                        var flag = {};
-                        flag.setter = match[1];
-                        flag.name = match[2];
-                        if (match[4] == "+" || match[4] == "-") {
-                            flag.type = match[4];
-                        } else {
-                            flag.type = "?";
-                            if (match[7]) {
-                                flag.requestee = match[7];
-                            }
-                        }
-
-                        // always show the obsolete attachments with a + flag
-                        if (flag.type == "+") {
-                            var parent = link.parentNode;
-                            while (parent) {
-                                if (parent.tagName.toLowerCase() == "tr") {
-                                    if (/bz_tr_obsolete/i.test(parent.className)) {
-                                        parent.className += " bztw_plusflag";
-                                    }
-                                    break;
-                                }
-                                parent = parent.parentNode;
-                            }
-                        }
-
-                        // try to put the flag name and type part in a span which we will
-                        // use in setupLinks to inject links into.
-                        match = this._reLinkifyInterestingFlag.exec(text);
-                        if (match) {
-                            el.textContent = match[1];
-                            if (match[3]) {
-                                var textNode = doc.createTextNode(match[3]);
-                                el.parentNode.insertBefore(textNode, el.nextSibling);
-                            }
-                            var span = doc.createElement("span");
-                            span.textContent = match[2];
-                            el.parentNode.insertBefore(span, el.nextSibling);
-
-                            flag.placeholder = span;
-                        }
-
-                        this._interestingFlags[attachmentID].push(new AttachmentFlag(flag));
-                    }
-                }
-            }
-        }
-    },
-    handleItem: function (name, item) {
-        var anchorsCreated = [];
-        var base = item[4] ? 2 : 0;
-        var what = trimContent(item[base]);
-        var match = this._reAttachmentFlagName.exec(what);
-        if (match) {
-            var id = match[1];
-            if (!(id in this._db)) {
-                this._db[id] = [];
-            }
-            name = name.split('@')[0]; // convert the name to the fraction before the @
-            var added = this._parseData(name, trimContent(item[base + 2]));
-            for (var i = 0; i < added.length; ++i) {
-                var flag = added[i];
-                if (!(id in this._interestingFlags))
-                    continue;
-                for (var j = 0; j < this._interestingFlags[id].length; ++j) {
-                    if (flag.equals(this._interestingFlags[id][j])) {
-                        // found an interesting flag
-                        this._interestingFlags[id][j].anchor = this.anchorName;
-                        anchorsCreated.push(this.anchorName);
-                        this._counter++;
-                        break;
-                    }
-                }
-            }
-        }
-        return anchorsCreated;
-    },
-    setupLinks: function (doc) {
-        for (var id in this._interestingFlags) {
-            for (var i = 0; i < this._interestingFlags[id].length; ++i) {
-                var flag = this._interestingFlags[id][i];
-                if ("placeholder" in flag &&
-                    "anchor" in flag) {
-                    var link = doc.createElement("a");
-                    link.href = "#" + flag.anchor;
-                    link.textContent = flag.placeholder.textContent;
-                    flag.placeholder.replaceChild(link, flag.placeholder.firstChild);
-                }
-            }
-        }
-    },
-    _parseData: function (name, str) {
-        var items = str.replace('\u2011', '-', 'g').split(', '), flags = [];
-        for (var i = 0; i < items.length; ++i) {
-            if (!items[i].length)
-                continue;
-
-            var match = this._reParseRequest.exec(items[i]);
-            if (match) {
-                var flag = {};
-                flag.name = match[1];
-                flag.setter = name;
-                if (match[4]) {
-                    flag.requestee = match[4];
-                }
-                flag.type = match[2];
-                flags.push(new AttachmentFlag(flag));
-            }
-        }
-        return flags;
-    },
-    _counter: 1,
-    get anchorName() {
-        return "attachflag" + this._counter;
-    },
-    _reParseRequest: /^(.+)([\?\-\+])(\((.+)@.+\))?$/,
-    _reParseInterestingFlag: /^(.+):\s+(.+)(([\-\+])|\?(\s+(\((.+)\)))?)$/,
-    _reLinkifyInterestingFlag: /^(.+:\s+)(.+[\-\+\?])(\s+\(.+\))?$/,
-    _reAttachmentHref: /attachment\.cgi\?id=(\d+)$/i,
-    _reAttachmentFlagName: /^Attachment\s+#(\d+)\s+Flags$/i
-};
-
-function CheckinCommentCtor() {
-    this.bugNumber = null;
-    this.summarySpan = null;
-    this.checkinFlags = "";
-}
-CheckinCommentCtor.prototype = {
-  initialize: function(doc, flags) {
-    this.bugNumber = getBugNo(doc);
-    var summarySpan = doc.getElementById("short_desc_nonedit_display");
-    if (summarySpan) {
-        this.summary = summarySpan.textContent;
-    }
-    var checkinFlagsMap = {};
-    for (var id in flags) {
-        for (var i = 0; i < flags[id].length; ++i) {
-            var flag = flags[id][i];
-            if (flag.type == "+") {
-                var name = flag.name;
-                if (name == "review") {
-                    name = "r";
-                } else if (name == "superreview") {
-                    name = "sr";
-                } else if (name == "ui-review") {
-                    name = "ui-r";
-                } else if (name == "feedback") {
-                    name = "f";
-                }
-                if (!(name in checkinFlagsMap)) {
-                    checkinFlagsMap[name] = {};
-                }
-                checkinFlagsMap[name][flag.setter]++;
-            }
-        }
-    }
-    var flagsOrdered = [];
-    for (var name in checkinFlagsMap) {
-        flagsOrdered.push(name);
-    }
-    flagsOrdered.sort(function (a, b) {
-        function convertToNumber(x) {
-            switch (x) {
-            case "f":
-                return -4;
-            case "r":
-                return -3;
-            case "sr":
-                return -2;
-            case "ui-r":
-                return -1;
-            default:
-                return 0;
-            }
-        }
-        var an = convertToNumber(a);
-        var bn = convertToNumber(b);
-        if (an == 0 && bn == 0) {
-            return a < b ? -1 : (a = b ? 0 : 1);
-        } else {
-            return an - bn;
-        }
-    });
-    var checkinFlags = [];
-    for (var i = 0; i < flagsOrdered.length; ++i) {
-        var name = flagsOrdered[i];
-        var flag = name + "=";
-        var setters = [];
-        for (var setter in checkinFlagsMap[name]) {
-            setters.push(setter);
-        }
-        flag += setters.join(",");
-        checkinFlags.push(flag);
-    }
-    this.checkinFlags = checkinFlags.join(" ");
-    if (this.isValid()) {
-      var div = doc.createElement("div");
-      div.setAttribute("style", "display: none;");
-      div.id = "__bz_tw_checkin_comment";
-      div.appendChild(doc.createTextNode(this.toString()));
-      doc.body.appendChild(div);
-    }
-  },
-  isValid: function() {
-      return this.bugNumber != null &&
-             this.summary != null;
-  },
-  toString: function() {
-    if (!this.isValid()) {
-        return "";
-    }
-    var message = "Bug " + this.bugNumber + " - " + this.summary;
-    if (this.checkinFlags.length) {
-        message += "; " + this.checkinFlags;
-    }
-    return message;
-  }
-};
-
-function DataStoreCtor(doc) {
-  this.storage = doc.defaultView.localStorage;
-  this.data = {};
-  this.bugNumber = null;
-  function visualizeStoredData() {
-    var data = "";
-    for (var i = 0; i < window.localStorage.length; ++i) {
-      var key = window.localStorage.key(i);
-      data += key + ": " + JSON.parse(window.localStorage.getItem(key).toString()).toSource() + "\n";
-    }
-    open("data:text/html,<pre>" + escape(htmlEncode(data)) + "</pre>");
-  }
-  function clearStoredData() {
-    var count = window.localStorage.length;
-    if (count > 0) {
-      if (window.confirm("You currently have data stored for " + count + " bugs.\n\n" +
-                         "Are you sure you want to clear this data?  This action cannot be undone.")) {
-        window.localStorage.clear();
-      }
-    } else {
-      alert("You don't have any data stored about your bugs");
-    }
-  }
-  var script = doc.createElement("script");
-  script.appendChild(doc.createTextNode(visualizeStoredData.toSource() +
-                                        clearStoredData.toSource() +
-                                        htmlEncode.toSource()));
-  doc.body.appendChild(script);
-  this.initialize(doc);
-}
-
-DataStoreCtor.prototype = {
-  initialize: function(doc) {
-    this.bugNumber = getBugNo(doc);
-    var data = this._ensureEntry(this.bugNumber, this.data);
-    // last visited date
-    data.visitedTime = (new Date()).getTime();
-    // last comment count
-    data.commentCount = doc.querySelectorAll(".bz_comment").length;
-    // last status of bug flags
-    var flags = this._ensureEntry("flags", data);
-    var flagRows = doc.querySelectorAll("#flags tr");
-    for (var i = 0; i < flagRows.length; ++i) {
-      var flagCols = flagRows[i].querySelectorAll("td");
-      if (flagCols.length != 3) {
-        continue;
-      }
-      var flagName = trimContent(flagCols[1]);
-      var flagValue = flagCols[2].querySelector("select");
-      if (flagValue) {
-        flagValue = flagValue.value;
-      } else {
-        continue;
-      }
-      flags[flagName] = flagValue;
-    }
-    flagRows = doc.querySelectorAll(".field_label[id^=field_label_cf_]");
-    for (var i = 0; i < flagRows.length; ++i) {
-      var flagName = trimContent(flagRows[i]).replace(/:$/, "");
-      var flagValue = flagRows[i].parentNode.querySelector("select");
-      if (flagValue) {
-        flagValue = flagValue.value;
-      } else {
-        continue;
-      }
-      flags[flagName] = flagValue;
-    }
-    // last attachments
-    var attachmentTable = doc.getElementById("attachment_table");
-    var attachmentRows = attachmentTable.querySelectorAll("tr");
-    for (var i = 0; i < attachmentRows.length; ++i) {
-      var attachmentCells = attachmentRows[i].querySelectorAll("td");
-      if (attachmentCells.length != 3) {
-        continue;
-      }
-      var link = attachmentCells[0].querySelector("a");
-      var match = this._reAttachmentHref.exec(link.href);
-      if (match) {
-        var attachmentID = match[1];
-        var attachment = this._ensureEntry("attachments", data);
-        var attachmentFlags = this._ensureArray(attachmentID, attachment);
-        for (var el = attachmentCells[1].firstChild; el.nextSibling; el = el.nextSibling) {
-          if (el.nodeType != el.TEXT_NODE) {
-            continue;
-          }
-          var text = trimContent(el);
-          if (!text) {
-            continue;
-          }
-          match = this._reParseInterestingFlag.exec(text);
-          if (match) {
-            var flag = {};
-            flag.setter = match[1];
-            flag.name = match[2];
-            if (match[4] == "+" || match[4] == "-") {
-                flag.type = match[4];
-            } else {
-                flag.type = "?";
-                if (match[7]) {
-                    flag.requestee = match[7];
-                }
-            }
-            attachmentFlags.push(flag);
-          }
-        }
-      }
-    }
-    // Write data to storage
-    for (var key in this.data) {
-      this._ensure(key, this.storage, JSON.stringify(this.data[key]));
-    }
-  },
-  _ensure: function(entry, obj, val) {
-    if (obj.toString().indexOf("[object Storage") >= 0) {
-      obj.setItem(entry, val);
-    } else {
-      if (typeof obj[entry] == "undefined")
-        obj[entry]  = val;
-      return obj[entry];
-    }
-  },
-  _ensureEntry: function(entry, obj) {
-    return this._ensure(entry, obj, {});
-  },
-  _ensureArray: function(entry, obj) {
-    return this._ensure(entry, obj, []);
-  },
-  _reParseInterestingFlag: /^(.+):\s+(.+)(([\-\+])|\?(\s+(\((.+)\)))?)$/,
-  _reAttachmentHref: /attachment\.cgi\?id=(\d+)$/i
-};
-
-
-function getUserName(doc) {
-  var links = doc.querySelectorAll("#header .links li");
-  var last = links[links.length - 1];
-  if (last.innerHTML.indexOf("logout") >= 0) {
-    return trimContent(last.lastChild);
-  }
-  return null;
-}
-
-function handleEmptyCollapsedBoxes(doc) {
-    // first, try to get the display style of a CC field (any would do)
-    var historyBoxes = doc.querySelectorAll(".bztw_history");
-    for (var i = 0; i < historyBoxes.length; ++i) {
-        var box = historyBoxes[i];
-        for (var j = 0; j < box.childNodes.length; ++j) {
-            var child = box.childNodes[j], found = true;
-            if (child.nodeType != child.ELEMENT_NODE)
-                continue;
-            if (child.className == "sep") {
-                // separators are insignificant
-                continue;
-            } else if (!/bztw_cc/.test(child.className)) {
-                found = false;
-                break;
-            }
-        }
-        if (found) {
-            box.className += " bztw_cc";
-        }
-    }
-}
-
-function applyClass(class_, html) {
-    return '<span class="' + class_ + '">' + html + '</span>';
-}
-
-function htmlEncode(str) {
-    return str.replace('&', '&amp;', 'g')
-              .replace('<', '&lt;', 'g')
-              .replace('>', '&gt;', 'g')
-              .replace('"', '&quot;', 'g');
-}
-
-function tbplbotSpamCollapser(d) {
-  var collapseExpandBox = d.querySelector(".bz_collapse_expand_comments");
-  if (!collapseExpandBox) {
-    return;
-  }
-  var a = d.createElement("a");
-  a.href = "#";
-  a.addEventListener("click", function(e) {
-    e.preventDefault();
-    var win = d.defaultView.wrappedJSObject;
-    var comments = d.querySelectorAll(".bz_comment");
-    for (var i = 0; i < comments.length; ++i) {
-      var comment = comments[i];
-      try {
-        if (comment.querySelector(".bz_comment_user a.email").href.substr(7) ==
-            "tbplbot@gmail.com") {
-          win.collapse_comment(comment.querySelector(".bz_collapse_comment"),
-                               comment.querySelector(".bz_comment_text"));
-        }
-      } catch (e) {
-        continue;
-      }
-    }
-    return false;
-  }, false);
-  a.appendChild(d.createTextNode("Collapse All tbplbot Comments"));
-  var li = d.createElement("li");
-  li.appendChild(a);
-  collapseExpandBox.appendChild(li);
-}
-
-tweakBugzilla(document);
diff --git a/data/lib/bugzillaDOMFunctions.js b/data/lib/bugzillaDOMFunctions.js
index 49afef5..98a2031 100644
--- a/data/lib/bugzillaDOMFunctions.js
+++ b/data/lib/bugzillaDOMFunctions.js
@@ -147,6 +147,32 @@ function getDefaultBugzillaMaintainer (component) {
 }
 
 /**
+ * dd
+ *
+ * @return Element with the href attribute containng the information
+ */
+function getOptionTableCell(tableId, label) {
+  var cleanLabelRE = new RegExp("^\\s*([^.:]*):?\\s*$");
+  label = label.trim().replace(cleanLabelRE,"$1").toLowerCase();
+
+  var rows = document.getElementById(tableId).getElementsByTagName("tr");
+  var ourLine = Array.filter(rows, function(row) {
+    var curLabelElems = row.getElementsByTagName("td");
+    if (curLabelElems.length > 0) {
+      var curLabel = curLabelElems[0].textContent.toLowerCase();
+      curLabel = curLabel.replace(cleanLabelRE,"$1");
+      return (curLabel === label); // maybe this could be a RE match instead
+    }
+  });
+
+  if (ourLine.length > 0) {
+    return ourLine[0].getElementsByTagName("td")[1].
+    getElementsByTagName("a")[0];
+  }
+  return null;
+}
+
+/**
  * Generic function to add new button to the page. Actually copies new button
  * from the old one (in order to have the same look-and-feel, etc.
  *
@@ -257,72 +283,6 @@ function getProduct() {
   return null;
 }
 
-function commentsWalker (fce) {
-  var comments = document.getElementById("comments").
-  getElementsByClassName("bz_comment");
-  Array.forEach(comments, function(item) {
-    fce(item);
-  });
-}
-
-
-/**
- * Parse the row with the attachment
- *
- * @param DOM
- *          element to be parsed
- * @return array with string name of the attachment, integer its id number,
- *         string of MIME type, integer of size in kilobytes, and the whole
- *         element itself
- *
- * TODO error handling is missing ... it's bleee
- */
-function parseAttachmentLine(inElem) {
-  var MIMEtype = "";
-  var size = 0;
-
-  // Skip over obsolete attachments
-  if (inElem.getElementsByClassName("bz_obsolete").length > 0) {
-    return ([]);
-  }
-
-  // getting name of the attachment
-  var attName = inElem.getElementsByTagName("b")[0].textContent.trim();
-
-  // TODO probably could use url.URL object
-  var aHrefsArr = inElem.getElementsByTagName("a");
-  var aHref = Array.filter(aHrefsArr, function(x) {
-    return x.textContent.trim() === "Details";
-  })[0];
-  var id = parseURL(aHref.getAttribute("href")).params.id;
-
-  // getting MIME type and size
-  var stringArray = inElem.getElementsByClassName("bz_attach_extra_info")[0].textContent.
-  replace(/[\n ()]+/g, " ").trim().split(", ");
-  size = parseInt(stringArray[0], 10);
-  MIMEtype = stringArray[1].split(" ")[0];
-
-  return [ attName, id, MIMEtype, size, inElem ];
-}
-
-
-/**
- * collect the list of attachments in a structured format
- *
- * @return Array of arrays, one for each attachments; each record has string
- *         name of the attachment, integer its id number, string of MIME type,
- *         integer of size in kilobytes, and the whole element itself
- */
-function getAttachments () {
-  var outAtts = [];
-  var atts = document.getElementById("attachment_table").
-  getElementsByTagName("tr");
-  for ( var i = 1, ii = atts.length - 1; i < ii; i++) {
-    outAtts.push(parseAttachmentLine(atts[i]));
-  }
-  return outAtts;
-}
-
 /**
  * Get login of the currently logged-in user.
  *
@@ -408,7 +368,6 @@ function killNodes(doc, target, remove) {
   // removing its members.
   for(var i = 0, ii = victimElements.length; i < ii; i++) {
     elem = victimElements[i];
-    console.myDebug("Killing element " + elem[0]);
     try {
       elem[1].parentNode.removeChild(elem[1]);
     }
diff --git a/data/lib/bzpage.js b/data/lib/bzpage.js
index 1be287d..c292acd 100644
--- a/data/lib/bzpage.js
+++ b/data/lib/bzpage.js
@@ -329,45 +329,26 @@ function setConfigurationButton () {
 }
 
 /**
- * dd
- *
- * @return Element with the href attribute containng the information
- */
-function getOptionTableCell(tableId, label) {
-  var cleanLabelRE = new RegExp("^\\s*([^.:]*):?\\s*$");
-  label = label.trim().replace(cleanLabelRE,"$1").toLowerCase();
-
-  var rows = document.getElementById(tableId).getElementsByTagName("tr");
-  var ourLine = Array.filter(rows, function(row) {
-    var curLabel = row.getElementsByTagName("td")[0].textContent.toLowerCase();
-    curLabel = curLabel.replace(cleanLabelRE,"$1");
-    return (curLabel === label); // maybe this could be a RE match instead
-  });
-
-  if (ourLine.length > 0) {
-    return ourLine[0].getElementsByTagName("td")[1].
-    getElementsByTagName("a")[0];
-  }
-  return null;
-}
-
-
-/**
  * Complete startup, mainly run alternate inits for non-standard BZ with proper
  * arguments
  *
  */
 function completeInit() {
-  var attachments = getAttachments();
+  // FIXME: add flags, and priority or others bits.
+  var things = {
+    attachments: new AttachList(document),
+    comments: new CommentList(document)
+  };
+
 
   if (RHBZinit) {
-    RHBZinit(attachments);
+    RHBZinit(things);
   }
 
-  console.log("completeInit: tweakBugzilla = " + typeof tweakBugzilla);
-  console.log("completeInit: config = " + config.toSource());
+  things.comments.colorComments();
+
   if (tweakBugzilla && config.verboseInlineHistory) {
-    tweakBugzilla(attachments, constantData);
+    tweakBugzilla(things, constantData);
   }
 }
 
@@ -410,8 +391,6 @@ function startup() {
   setConfigurationButton();
   submitHandlerInstalled = false;
 
-  checkComments();
-
   self.postMessage(new Message("GetInstalledPackages", {
     location: window.location.href,
     login: getLogin()
diff --git a/data/lib/collectingMetadata.js b/data/lib/collectingMetadata.js
new file mode 100644
index 0000000..efd9754
--- /dev/null
+++ b/data/lib/collectingMetadata.js
@@ -0,0 +1,182 @@
+// Released under the MIT/X11 license
+// http://www.opensource.org/licenses/mit-license.php
+"use strict";
+
+function Comment(comment) {
+    var nameSpan = comment.querySelector(".bz_comment_user a.email");
+    var timeSpan = comment.getElementsByClassName("bz_comment_time")[0];
+
+    this.author = parseMailto(nameSpan).trim();
+    this.element = comment;
+    this.date = parseBZCommentDate(timeSpan.textContent.trim());
+    this.timeSpan = timeSpan;
+}
+
+
+function CommentList(doc) {
+  var comments = document.getElementById("comments").
+    getElementsByClassName("bz_comment");
+  comments = [];
+  Array.forEach(comments, function(item) {
+    var com = new Comment(item);
+    if (com.element) {
+      comments[ISODateString(com.date)] = com;
+    }
+  });
+  this.comments = comments;
+}
+
+/**
+ * Set background color of all comments made by reporter in ReporterColor color
+ *
+ */
+CommentList.prototype.colorComments = function colorComments() {
+  var reporter = getReporter();
+  var reporterComments = this.comments.filter(function (com) {
+    return com.author === reporter;
+  });
+  reporterComments.forEach(function (com) {
+    com.element.style.backgroundColor = ReporterColor.toString();
+  });
+}
+
+CommentList.prototype.getAllCommentsText =  function getAllCommentsText() {
+  return this.comments.reduce(function (outStr, com) {
+    outStr += com.getElementsByTagName("pre")[0].textContent + "\n";
+  }).trim();
+}
+
+// -----------------------------------------------------------
+
+/**
+ * Parse the row with the attachment and create new Attachment object
+ *
+ * @param DOM
+ *          element to be parsed
+ *
+ * TODO error handling is missing ... it's bleee
+ *
+ * [ attName, id, MIMEtype, size, inElem ];
+ */
+function Attachment(inElem) {
+  // Skip over obsolete attachments
+  if (inElem.getElementsByClassName("bz_obsolete").length > 0) {
+    return; // FIXME how NOT to create an object?
+  }
+
+  // getting name of the attachment
+  this.name = inElem.getElementsByTagName("b")[0].textContent.trim();
+
+  // TODO probably could use url.URL object
+  var aHrefsArr = inElem.getElementsByTagName("a");
+  var aHref = Array.filter(aHrefsArr, function(x) {
+    return x.textContent.trim() === "Details";
+  })[0];
+  this.id = parseURL(aHref.getAttribute("href")).params.id;
+
+  // getting MIME type and size
+  var stringArray = inElem.getElementsByClassName("bz_attach_extra_info")[0].
+    textContent.replace(/[\n ()]+/g, " ").trim().split(", ");
+  this.size = parseInt(stringArray[0], 10);
+  this.mimeType = stringArray[1].split(" ")[0];
+  this.element = inElem;
+};
+
+Attachment.prototype.isBadMIME = function isBadMIME() {
+  var badMIMEArray = [ "application/octet-stream", "text/x-log", "undefined" ];
+  return isInList(this.mimeType, badMIMEArray);
+};
+
+Attachment.prototype.checkXorgLink = function checkXorgLink() {
+  var elemS = this.element.getElementsByTagName("td");
+  var elem = elemS[elemS.length - 1];
+  createDeadLink("xorgLogAnalyzeLink", "check", elem,
+      analyzeXorgLog, [this.id, "AnalyzeXorgLogBacktrace"], "br");
+};
+
+Attachment.prototype.isParsed = function isParsed() {
+  var titleParsedAttachment = "Part of the thread where crash happened";
+  return (new RegExp(titleParsedAttachment).test(this.name));
+};
+
+// ----------------------------------------------------------------------------
+function AttachList(doc) {
+  this.attachments = [];
+  var attach = {};
+  var attElements = doc.getElementById("attachment_table").
+    getElementsByTagName("tr");
+  // FIXME change into list of objects and both comments and
+  // attachments (and something else?) should be properties of one
+  // huge object
+  for ( var i = 1, ii = attElements.length - 1; i < ii; i++) {
+    attach = new Attachment(attElements[i]);
+    if (attach.id) {
+      this.attachments.push(attach);
+    }
+  }
+}
+
+AttachList.prototype.getBadAttachments = function getBadAttachments() {
+  return this.attachments.filter(function(att) {
+    return (att.isBadMIME());
+  });
+}
+
+/**
+ * Add a link opening selected lines of Xorg.0.log
+ */
+AttachList.prototype.addCheckXorgLogLink = function addCheckXorgLogLink() {
+  if (config.XorgLogAnalysis) {
+    this.attachments.forEach(function (att) {
+      att.checkXorgLink();
+    });
+  }
+}
+
+/**
+ * Make it sailent that the some attachments with bad MIME type are present
+ *
+ * @param atts
+ *          Array of attachments subarrays
+ * @return none
+ */
+AttachList.prototype.markBadAttachments = function markBadAttachments() {
+  if (!constantData.passwordState.passAvailable) {
+    console.log("markBadAttachments : No password, no XML-RPC calls; sorry");
+    return null;
+  }
+
+  var badAttachments = this.getBadAttachments();
+
+  if (badAttachments.length > 0) {
+    var titleElement = document.
+      getElementsByClassName("bz_alias_short_desc_container")[0];
+    titleElement.style.backgroundColor = "olive";
+
+    createDeadLink("fixAllButton", "Fix all", titleElement, function() {
+      Array.forEach(badAttachments, function(x) {
+        fixAttachById(x[1], constantData.XMLRPCData[window.location.hostname].url);
+      });
+    }, [], false, null, "f");
+    badAttachments.forEach(function(x, i, a) {
+      addTextLink(x, constantData.XMLRPCData[window.location.hostname].url);
+    });
+  }
+};
+
+AttachList.prototype.getParsedAttachments = function getParsedAttachments() {
+  return this.attachments.filter(function (att) {
+    return (att.isParsed());
+  });
+};
+
+AttachList.prototype.getXorgList = function getXorgList() {
+  return this.attachments.filter(function (value) {
+    // Xorg.0.log must be text, otherwise we cannot parse it
+    return (/[xX].*log/.test(value.name) && /text/.test(value.mimeType));
+  });
+};
+
+AttachList.prototype.forEach = function forEach(fce) {
+  this.attachments.forEach(fce);
+};
diff --git a/data/lib/otherButtons.js b/data/lib/otherButtons.js
index 31a4dd8..ea5f67b 100644
--- a/data/lib/otherButtons.js
+++ b/data/lib/otherButtons.js
@@ -3,30 +3,6 @@
 "use strict";
 
 /**
- * Set background color of all comments made by reporter in ReporterColor color
- *
- */
-function checkComments() {
-  var reporter = getReporter();
-  commentsWalker(function(x) {
-    var email = parseMailto(x.getElementsByClassName("vcard")[0]
-        .getElementsByTagName("a")[0]);
-    if (email.indexOf(reporter) != -1) {
-      x.style.backgroundColor = ReporterColor.toString();
-    }
-  });
-}
-
-function collectComments() {
-  var outStr = "";
-  commentsWalker(function(x) {
-    outStr += x.getElementsByTagName("pre")[0].textContent
-        + "\n";
-  });
-  return outStr.trim();
-}
-
-/**
  * Find default assignee based on the current component
  *
  * @return String what would be a default assignee if we haven't set it up.
@@ -138,9 +114,10 @@ function addingEmbelishments(logList) {
  *          String with the IsueTracker numbers
  * @return none
  */
-function setBranding(xLogAtts) {
+function setBranding(atts) {
   var brandColor = {};
   var TriagedColor = {};
+  var xLogAtts = atts.getXorgList();
 
   var ITbutton = document.getElementById("cf_issuetracker");
   var its = ITbutton ? ITbutton.value.trim() : "";
diff --git a/data/rhlib/rhbzpage.js b/data/rhlib/rhbzpage.js
index c3c36de..121885e 100644
--- a/data/rhlib/rhbzpage.js
+++ b/data/rhlib/rhbzpage.js
@@ -15,7 +15,6 @@ var RawhideColor = new Color(0, 119, 0); // or "green", or RGB 0, 119, 0, or
 // HSL
 // 120, 0, 23
 var RHITColor = new Color(102, 0, 102); // RGB 102, 0, 102; HSL 300, 0, 20
-var titleParsedAttachment = "Part of the thread where crash happened";
 
 // [ 126.386] (--) NOUVEAU(0): Chipset: "NVIDIA NVaf"
 var logAnalyzeLogic = {
@@ -55,7 +54,7 @@ var ProfessionalProducts = [
 // END OF CONSTANTS
 
 var btSnippet = null;
-
+var localThings = null; // I don't like it, but we need to store it somewhere for now
 
 function RHOnMessageHandler(msg, nextHandlerList) {
   switch (msg.cmd) {
@@ -158,75 +157,33 @@ function RHcentralCommandDispatch(cmdLabel, cmdParams) {
 /* === Bugzilla functions === */
 
 /**
- * Make it sailent that the some attachments with bad MIME type are present
- *
- * @param atts
- *          Array of attachments subarrays
- * @return none
- */
-function markBadAttachments(atts) {
-  var badMIMEArray = [ "application/octet-stream", "text/x-log", "undefined" ];
-  if (!constantData.passwordState.passAvailable) {
-    console.myDebug("markBadAttachments : No password, no XML-RPC calls; sorry");
-    return null;
-  }
-
-  var badAttachments = atts.filter(function(att) {
-    return (isInList(att[2], badMIMEArray));
-  });
-
-  if (badAttachments.length > 0) {
-    var titleElement = document.
-    getElementsByClassName("bz_alias_short_desc_container")[0];
-    titleElement.style.backgroundColor = "olive";
-
-    createDeadLink("fixAllButton", "Fix all", titleElement, function() {
-      Array.forEach(badAttachments, function(x) {
-        fixAttachById(x[1], constantData.XMLRPCData[window.location.hostname].url);
-      });
-    }, [], false, null, "f");
-    badAttachments.forEach(function(x, i, a) {
-      addTextLink(x, constantData.XMLRPCData[window.location.hostname].url);
-    });
-  }
-}
-
-/**
  * Open a tab in the upstream bugzilla to create a new bug
  *
  * @return none
  */
-function sendBugUpstream() {
-  var admitMsg = "(originally filed as " + window.location.href + ")\n\n";
-  var urlStr = filterByRegexp(constantData.newUpstreamBug, getComponent());
-  if (!urlStr) {
-    return null;
+function sendBugUpstream(thgs) {
+  console.myDebug("sendBugUpstream: thgs = " + thgs);
+  if (thgs) {
+    localThings = thgs;
+    return;
   }
-  
-  self.postMessage(new Message("OpenBugUpstream", {
-    url: urlStr,
-    subject: document.getElementById("short_desc_nonedit_display").
-    textContent.trim(),
-    comment: admitMsg + collectComments()
-  }));
-}
+  if (localThings) {
+    var admitMsg = "(originally filed as " + window.location.href + ")\n\n";
+    var urlStr = filterByRegexp(constantData.newUpstreamBug, getComponent());
+    if (!urlStr) {
+      return null;
+    }
 
-/**
- * Add a link opening selected lines of Xorg.0.log
- *
- * @return none
- */
-function addCheckXorgLogLink(attList) {
-  if (config.XorgLogAnalysis) {
-    attList.forEach(function (row) {
-      var elemS = row[4].getElementsByTagName("td");
-      var elem = elemS[elemS.length - 1];
-      createDeadLink("xorgLogAnalyzeLink", "check", elem,
-          analyzeXorgLog, [row[1], "AnalyzeXorgLogBacktrace"], "br");
-    });
+    self.postMessage(new Message("OpenBugUpstream", {
+      url: urlStr,
+      subject: document.getElementById("short_desc_nonedit_display").
+        textContent.trim(),
+      comment: admitMsg + localThings.comments.getAllCommentsText()
+    }));
   }
 }
 
+
 /**
  * Given line to be parsed, find out which chipset it is and fill in the
  * whiteboard
@@ -470,21 +427,21 @@ function parseBacktrace (ret) {
   return "";
 }
 
-function RHBZinit(attachments) {
+function RHBZinit(things) {
   // inheritance ... call superobject's constructor
   var AbrtRE = new RegExp("^\\s*\\[abrt\\]");
   var btSnippet = "";
+  sendBugUpstream(things); // FIXME this is not a real call,
+                           // just initializing static variable
 
   var chipMagicInterestingLine = "";
 
   // getBadAttachments
   var XorgLogAttList = [];
   var XorgLogAttListIndex = 0;
-  markBadAttachments(attachments);
+  things.attachments.markBadAttachments();
 
-  var parsedAttachments = attachments.filter(function (att) {
-    return (new RegExp(titleParsedAttachment).test(att[0]));
-  });
+  var parsedAttachments = things.attachments.getParsedAttachments();
 
   if (constantData.defaultAssignee) {
     setDefaultAssignee();
@@ -506,21 +463,14 @@ function RHBZinit(attachments) {
   // Dig out backtrace protection against double-firing?
   btSnippet = "";
 
-  var parseAbrtBacktraces = config.parseAbrtBacktraces;
-  if (parseAbrtBacktraces && AbrtRE.test(getSummary())) {
+  if (config.parseAbrtBacktraces && AbrtRE.test(getSummary())) {
     pasteBacktraceInComments(parsedAttachments);
   }
 
-  // Find out Xorg.0.log attachment URL
-  XorgLogAttList = attachments.filter(function (value) {
-    // Xorg.0.log must be text, otherwise we cannot parse it
-    return (/[xX].*log/.test(value[0]) && /text/.test(value[2]));
-  });
-
   // Just add a link to every Xorg.0.log link analyzing it.
-  addCheckXorgLogLink(XorgLogAttList);
+  things.attachments.addCheckXorgLogLink();
 
-  setBranding(XorgLogAttList);
+  setBranding(things.attachments);
 
   // Don't allow to submit a page which would change the bug to 0xFFFF component
   document.forms.namedItem("changeform").addEventListener(
diff --git a/data/tweaks/viewSource.js b/data/tweaks/viewSource.js
index 81e6735..fdf92d3 100644
--- a/data/tweaks/viewSource.js
+++ b/data/tweaks/viewSource.js
@@ -39,12 +39,12 @@ var reAttachmentType = /,\s+([^ )]*)[;)]/;
 
 function viewAttachmentSource(attachments) {
   attachments.forEach(function(att) {
-    if (att.length < 1) {
+    if (!att.id) {
       return;
     }
-    var typeName = att[2];
-    var elem = att[4];
-    var id = att[1];
+    var typeName = att.name;
+    var elem = att.element;
+    var id = att.id;
     var attachHref = elem.getAttribute("href");
 
     if (typeName == "application/java-archive"
diff --git a/lib/main.js b/lib/main.js
index e23e29e..909de44 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -137,6 +137,7 @@ var contentScriptLibraries = [
     self.data.url("lib/util.js"),
     self.data.url("lib/jumpNextBug.js"),
     self.data.url("lib/queries.js"),
+    self.data.url("lib/collectingMetadata.js"),
     self.data.url("tweaks/preprocessDuplicates.js"),
     self.data.url("tweaks/viewSource.js"),
     self.data.url("lib/color.js"),