From 4fb804559132fc7d96548c765c79b2082ba339b6 Mon Sep 17 00:00:00 2001
From: Jordan Bates <saudrapsmann@gmail.com>
Date: Fri, 10 May 2013 07:25:17 -0700
Subject: [PATCH] Apparently only the US flag is in troll/. Weird.

---
 builds/4chan-X.js                     | 6 +++---
 builds/4chan-X.user.js                | 6 +++---
 builds/crx/script.js                  | 6 +++---
 src/General/Build.coffee              | 2 +-
 src/Miscellaneous/ExpandThread.coffee | 2 +-
 src/Monitoring/ThreadUpdater.coffee   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 27c0d6a4f..934f8ad91 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -1889,7 +1889,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "country/troll/") + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "country/" + (boardID === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHtml = isOP ? ("<div class=file id=f" + data.no + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>" : ("<div class=file id=f" + data.no + "><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted-res.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>";
       } else if (file) {
@@ -7257,7 +7257,7 @@
           continue;
         }
         count++;
-        node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
+        node = Build.postFromObject(postObject, ThreadUpdater.thread.board.ID);
         posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
       }
       deletedPosts = [];
@@ -8408,7 +8408,7 @@
           nodes.push(post.nodes.root);
           continue;
         }
-        node = Build.postFromObject(reply, thread.board);
+        node = Build.postFromObject(reply, thread.board.ID);
         post = new Post(node, thread, thread.board);
         link = $('a[title="Highlight this post"]', node);
         link.href = "res/" + thread + "#p" + post;
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index c04a9a8f6..c072021b5 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1885,7 +1885,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "country/troll/") + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "country/" + (boardID === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHtml = isOP ? ("<div class=file id=f" + data.no + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>" : ("<div class=file id=f" + data.no + "><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted-res.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>";
       } else if (file) {
@@ -7266,7 +7266,7 @@
           continue;
         }
         count++;
-        node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
+        node = Build.postFromObject(postObject, ThreadUpdater.thread.board.ID);
         posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
       }
       deletedPosts = [];
@@ -8417,7 +8417,7 @@
           nodes.push(post.nodes.root);
           continue;
         }
-        node = Build.postFromObject(reply, thread.board);
+        node = Build.postFromObject(reply, thread.board.ID);
         post = new Post(node, thread, thread.board);
         link = $('a[title="Highlight this post"]', node);
         link.href = "res/" + thread + "#p" + post;
diff --git a/builds/crx/script.js b/builds/crx/script.js
index c27a48572..39e26854f 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1887,7 +1887,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "country/troll/") + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "country/" + (boardID === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHtml = isOP ? ("<div class=file id=f" + data.no + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>" : ("<div class=file id=f" + data.no + "><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted-res.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>";
       } else if (file) {
@@ -7244,7 +7244,7 @@
           continue;
         }
         count++;
-        node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
+        node = Build.postFromObject(postObject, ThreadUpdater.thread.board.ID);
         posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
       }
       deletedPosts = [];
@@ -8400,7 +8400,7 @@
           nodes.push(post.nodes.root);
           continue;
         }
-        node = Build.postFromObject(reply, thread.board);
+        node = Build.postFromObject(reply, thread.board.ID);
         post = new Post(node, thread, thread.board);
         link = $('a[title="Highlight this post"]', node);
         link.href = "res/" + thread + "#p" + post;
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index cf6d93a77..1f14e7107 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -110,7 +110,7 @@ Build =
 
     flag =
       if flagCode
-        " <img src='#{staticPath}country/troll/" +
+        " <img src='#{staticPath}country/#{if boardID is 'pol' then 'troll/' else ''}" +
         flagCode.toLowerCase() + ".gif' alt=#{flagCode} title='#{flagName}' class=countryFlag>"
       else
         ''
diff --git a/src/Miscellaneous/ExpandThread.coffee b/src/Miscellaneous/ExpandThread.coffee
index 92e565909..06174fd89 100644
--- a/src/Miscellaneous/ExpandThread.coffee
+++ b/src/Miscellaneous/ExpandThread.coffee
@@ -84,7 +84,7 @@ ExpandThread =
       if post = thread.posts[reply.no]
         nodes.push post.nodes.root
         continue
-      node = Build.postFromObject reply, thread.board
+      node = Build.postFromObject reply, thread.board.ID
       post = new Post node, thread, thread.board
       link = $ 'a[title="Highlight this post"]', node
       link.href = "res/#{thread}#p#{post}"
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index ad8dea5c3..5a4fc92a3 100644
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -268,7 +268,7 @@ ThreadUpdater =
       continue if num <= ThreadUpdater.lastPost
       # Insert new posts, not older ones.
       count++
-      node = Build.postFromObject postObject, ThreadUpdater.thread.board
+      node = Build.postFromObject postObject, ThreadUpdater.thread.board.ID
       posts.push new Post node, ThreadUpdater.thread, ThreadUpdater.thread.board
 
     deletedPosts = []