Merge branch 'master' into glitch-soc/tentative-merge

Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f994.svg b/public/emoji/1f994.svg
index 52361720c..ebbfc2ad2 100644
--- a/public/emoji/1f994.svg
+++ b/public/emoji/1f994.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(28.6885,15.6875)" id="g20"><path id="path22" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.904 -4.784,-10.688 -10.689,-10.688 -5.902,0 -10.688,4.784 -10.688,10.688 0,5.903 4.786,10.689 10.688,10.689 C -4.784,10.689 0,5.903 0,0"/></g><g transform="translate(26,2.5)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -1.665,0 -2.479,1.339 -2.763,2.31 l -2.664,0.055 c -0.153,0.003 -0.297,0.077 -0.389,0.2 -0.092,0.123 -0.123,0.282 -0.083,0.43 l 0.594,2.216 -2.446,0.651 c -0.152,0.041 -0.276,0.151 -0.335,0.296 -0.06,0.146 -0.046,0.311 0.035,0.446 l 1.198,1.993 -2.155,1.192 c -0.139,0.077 -0.234,0.216 -0.254,0.374 -0.02,0.157 0.036,0.316 0.151,0.426 l 1.729,1.647 -1.729,1.646 c -0.115,0.11 -0.171,0.267 -0.151,0.426 0.02,0.158 0.115,0.297 0.254,0.374 l 2.156,1.194 -1.2,1.994 c -0.08,0.134 -0.094,0.299 -0.034,0.445 0.059,0.146 0.183,0.255 0.335,0.296 l 2.446,0.65 -0.594,2.218 c -0.04,0.148 -0.009,0.307 0.083,0.43 0.092,0.123 0.236,0.196 0.39,0.199 l 2.574,0.054 0.058,2.302 c 0.004,0.149 0.074,0.289 0.192,0.381 0.118,0.092 0.271,0.127 0.416,0.094 l 2.521,-0.56 0.718,2.234 c 0.044,0.138 0.147,0.251 0.282,0.308 0.135,0.056 0.287,0.051 0.417,-0.014 l 2.284,-1.138 1.341,2.009 c 0.08,0.119 0.208,0.199 0.35,0.218 0.144,0.018 0.286,-0.025 0.394,-0.119 L -8,26.242 l 1.88,1.635 c 0.109,0.095 0.251,0.137 0.394,0.119 0.143,-0.019 0.27,-0.099 0.35,-0.219 l 1.34,-2.008 2.286,1.138 c 0.13,0.066 0.283,0.07 0.417,0.014 0.135,-0.057 0.237,-0.17 0.282,-0.308 l 0.716,-2.234 2.522,0.56 c 0.146,0.033 0.297,-0.002 0.416,-0.094 0.118,-0.092 0.188,-0.232 0.192,-0.381 L 2.853,22.162 5.427,22.108 C 5.58,22.105 5.724,22.031 5.815,21.909 5.908,21.786 5.939,21.627 5.898,21.479 L 5.304,19.261 7.753,18.611 C 7.905,18.57 8.029,18.461 8.089,18.315 8.148,18.169 8.135,18.004 8.054,17.87 L 6.853,15.876 9.008,14.682 C 9.148,14.605 9.241,14.466 9.262,14.308 9.282,14.149 9.226,13.991 9.11,13.882 L 7.381,12.236 9.11,10.589 C 9.226,10.479 9.282,10.32 9.262,10.163 9.241,10.005 9.148,9.866 9.008,9.789 L 6.854,8.597 8.054,6.604 C 8.135,6.469 8.148,6.304 8.089,6.158 8.029,6.013 7.905,5.903 7.754,5.862 L 5.304,5.211 5.898,2.995 C 5.939,2.847 5.908,2.689 5.816,2.565 5.724,2.442 5.58,2.368 5.427,2.365 L 2.764,2.31 C 2.48,1.339 1.665,0 0,0"/></g><g transform="translate(16.188,7.1758)" id="g28"><path id="path30" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.022,0 -0.044,0.001 -0.066,0.004 -0.142,0.019 -0.27,0.099 -0.35,0.219 l -1.058,1.585 -1.804,-0.9 C -3.41,0.844 -3.561,0.838 -3.696,0.895 -3.83,0.951 -3.933,1.064 -3.978,1.203 L -4.542,2.96 -6.532,2.518 C -6.68,2.486 -6.831,2.521 -6.948,2.612 -7.066,2.704 -7.136,2.844 -7.14,2.993 L -7.185,4.797 -9.214,4.84 c -0.154,0.003 -0.297,0.077 -0.39,0.2 -0.092,0.122 -0.123,0.281 -0.083,0.43 l 0.465,1.732 -1.922,0.512 c -0.152,0.041 -0.276,0.15 -0.335,0.296 -0.059,0.145 -0.046,0.31 0.035,0.445 l 0.937,1.557 -1.689,0.934 c -0.139,0.077 -0.234,0.216 -0.254,0.373 -0.02,0.158 0.035,0.316 0.151,0.426 l 1.352,1.289 -1.352,1.287 c -0.115,0.11 -0.171,0.268 -0.151,0.426 0.02,0.158 0.115,0.296 0.254,0.374 l 1.689,0.935 -0.937,1.557 c -0.081,0.135 -0.094,0.3 -0.035,0.446 0.059,0.146 0.183,0.255 0.335,0.296 l 1.922,0.51 -0.465,1.735 c -0.04,0.148 -0.009,0.306 0.083,0.429 0.093,0.123 0.236,0.197 0.39,0.2 l 2.029,0.042 0.045,1.805 c 0.004,0.149 0.074,0.289 0.192,0.381 0.117,0.092 0.27,0.127 0.416,0.094 l 1.99,-0.442 0.564,1.756 c 0.045,0.139 0.148,0.252 0.282,0.308 0.136,0.056 0.287,0.052 0.418,-0.013 l 1.804,-0.9 1.058,1.584 c 0.08,0.119 0.208,0.199 0.35,0.218 0.144,0.021 0.286,-0.024 0.394,-0.119 l 1.484,-1.291 1.484,1.291 c 0.11,0.096 0.253,0.138 0.395,0.119 0.142,-0.019 0.269,-0.099 0.349,-0.218 l 1.057,-1.584 1.807,0.9 c 0.13,0.065 0.283,0.069 0.417,0.013 0.135,-0.057 0.237,-0.169 0.282,-0.308 l 0.562,-1.756 1.992,0.442 c 0.145,0.033 0.299,-0.002 0.416,-0.094 0.118,-0.092 0.188,-0.232 0.192,-0.382 l 0.045,-1.804 2.028,-0.042 c 0.154,-0.003 0.297,-0.077 0.389,-0.2 0.093,-0.123 0.123,-0.281 0.083,-0.43 l -0.465,-1.734 1.924,-0.51 c 0.152,-0.041 0.276,-0.15 0.336,-0.296 0.059,-0.146 0.046,-0.311 -0.035,-0.446 l -0.939,-1.558 1.689,-0.934 c 0.14,-0.078 0.233,-0.216 0.254,-0.374 0.02,-0.158 -0.036,-0.316 -0.152,-0.426 l -1.352,-1.287 1.352,-1.289 c 0.116,-0.11 0.172,-0.267 0.152,-0.426 -0.021,-0.157 -0.116,-0.296 -0.254,-0.373 L 14.132,10.012 15.07,8.455 C 15.151,8.32 15.164,8.155 15.105,8.01 15.045,7.864 14.921,7.755 14.77,7.714 L 12.845,7.202 13.31,5.47 C 13.35,5.321 13.32,5.163 13.228,5.04 13.135,4.917 12.992,4.843 12.838,4.84 L 10.81,4.797 10.765,2.993 C 10.761,2.844 10.691,2.704 10.573,2.612 10.456,2.521 10.302,2.486 10.157,2.518 L 8.165,2.96 7.603,1.203 C 7.558,1.064 7.456,0.951 7.321,0.895 7.187,0.837 7.037,0.842 6.904,0.908 L 5.098,1.808 4.04,0.223 C 3.96,0.103 3.833,0.023 3.691,0.004 3.549,-0.014 3.405,0.028 3.296,0.123 L 1.812,1.417 0.329,0.123 C 0.237,0.043 0.12,0 0,0"/></g><g transform="translate(13.5,8.9484)" id="g32"><path id="path34" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 9,0 c 3.521,0 6.5,-2.575 6.5,-4.5 0,-1.65 -1.35,-2 -3,-2 l -16,0 c -1.65,0 -3,0.35 -3,2 0,1.925 2.99,4.5 6.5,4.5"/></g><g transform="translate(26.2217,13.2207)" id="g36"><path id="path38" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.088 -3.68,-7.398 -8.222,-7.398 -4.541,0 -8.221,3.31 -8.221,7.398 0,4.087 3.68,7.4 8.221,7.4 C -3.68,7.4 0,4.087 0,0"/></g><g transform="translate(21.2891,9.5215)" id="g40"><path id="path42" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.043 -1.473,-3.699 -3.289,-3.699 -1.817,0 -3.289,1.656 -3.289,3.699 0,2.043 1.472,3.699 3.289,3.699 C -1.473,3.699 0,2.043 0,0"/></g><g transform="translate(19.6445,8.2891)" id="g44"><path id="path46" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.908 -0.736,-1.645 -1.645,-1.645 -0.908,0 -1.644,0.737 -1.644,1.645 0,0.908 0.736,1.643 1.644,1.643 C -0.736,1.643 0,0.908 0,0"/></g><g transform="translate(14.7114,14.4551)" id="g48"><path id="path50" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.682 -0.552,-1.234 -1.233,-1.234 -0.681,0 -1.234,0.552 -1.234,1.234 0,0.68 0.553,1.232 1.234,1.232 C -0.552,1.232 0,0.68 0,0"/></g><g transform="translate(23.7549,14.4551)" id="g52"><path id="path54" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.682 -0.552,-1.234 -1.232,-1.234 -0.682,0 -1.234,0.552 -1.234,1.234 0,0.68 0.552,1.232 1.234,1.232 C -0.552,1.232 0,0.68 0,0"/></g><g transform="translate(11.4224,18.1543)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 4.111,1.645 4.933,0 0.822,-1.645 1.645,-1.645 1.645,-1.645 l 0,4.934 C 6.578,3.289 0,3.289 0,0"/></g><g transform="translate(24.5771,18.1543)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -4.11,1.645 -4.933,0 -0.822,-1.645 -1.644,-1.645 -1.644,-1.645 l 0,4.934 c 0,0 6.577,0 6.577,-3.289"/></g><g transform="translate(12.2446,17.7437)" id="g64"><path id="path66" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.136 -0.92,-2.056 -2.055,-2.056 -1.136,0 -2.056,0.92 -2.056,2.056 0,1.135 0.92,2.055 2.056,2.055 C -0.92,2.055 0,1.135 0,0"/></g><g transform="translate(27.8662,17.7437)" id="g68"><path id="path70" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.136 -0.92,-2.056 -2.056,-2.056 -1.134,0 -2.055,0.92 -2.055,2.056 0,1.135 0.921,2.055 2.055,2.055 C -0.92,2.055 0,1.135 0,0"/></g><g transform="translate(11,1)" id="g72"><path id="path74" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2,0 -2,4 2,4 6,4 6.062,0 4,0 L 0,0 Z"/></g><g transform="translate(21,1)" id="g76"><path id="path78" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2,0 -2,4 2,4 6,4 6.062,0 4,0 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#6D6E71" d="M28.688 20.312C28.688 26.217 23.904 31 18 31c-5.903 0-10.688-4.783-10.688-10.688 0-5.903 4.786-10.689 10.688-10.689 5.904.001 10.688 4.786 10.688 10.689z"/><path fill="#662113" d="M26 33.5H10c-1.665 0-2.479-1.339-2.763-2.31l-2.664-.056c-.153-.003-.297-.077-.389-.2-.092-.122-.123-.281-.083-.43l.594-2.216-2.446-.651c-.152-.041-.276-.15-.335-.296s-.046-.311.035-.445l1.199-1.993-2.156-1.192c-.139-.077-.233-.216-.254-.374-.02-.157.036-.315.151-.426l1.729-1.647-1.729-1.646c-.115-.11-.171-.268-.151-.426.021-.158.115-.297.254-.374l2.156-1.194-1.2-1.994c-.081-.135-.094-.3-.035-.445.059-.146.183-.255.335-.296l2.446-.65-.594-2.218c-.04-.148-.009-.307.083-.43s.236-.196.39-.2l2.575-.053.058-2.302c.004-.149.074-.289.192-.381.118-.092.271-.127.416-.094l2.521.561.717-2.234c.045-.139.148-.251.282-.308.136-.056.288-.051.417.014l2.284 1.139 1.341-2.009c.08-.119.208-.199.35-.218.145-.019.287.024.394.119L18 7.258l1.88-1.636c.109-.094.251-.137.395-.118.143.019.269.099.35.218l1.34 2.009 2.286-1.139c.13-.065.283-.069.417-.014.135.057.237.169.282.308l.716 2.234 2.521-.561c.146-.032.298.002.416.094s.188.232.192.381l.058 2.302 2.574.053c.153.003.297.077.389.2.093.123.123.282.083.43l-.595 2.217 2.449.65c.152.04.276.15.336.296.059.146.046.311-.035.445l-1.201 1.994 2.155 1.194c.14.077.233.216.254.374s-.036.316-.151.426l-1.729 1.646 1.729 1.647c.115.11.172.269.151.426-.021.158-.114.297-.254.374L32.854 24.9l1.2 1.993c.081.135.094.3.035.445-.06.146-.184.255-.335.296l-2.45.651.595 2.216c.04.148.01.307-.082.43-.093.123-.236.197-.39.2l-2.663.056c-.285.974-1.099 2.313-2.764 2.313z"/><path fill="#8A4B38" d="M16.188 28.824c-.022 0-.044-.001-.066-.004-.143-.019-.27-.099-.35-.219l-1.058-1.585-1.805.899c-.131.064-.283.07-.418.014-.134-.057-.237-.169-.282-.309l-.564-1.757-1.99.442c-.148.031-.299-.003-.417-.095s-.188-.231-.192-.381l-.045-1.804-2.029-.043c-.153-.003-.297-.077-.389-.2-.092-.122-.123-.281-.083-.43l.464-1.732-1.92-.51c-.152-.041-.276-.15-.335-.296s-.046-.311.035-.445l.937-1.557-1.688-.934c-.14-.077-.234-.216-.254-.374-.02-.158.036-.316.151-.426l1.352-1.289-1.352-1.287c-.115-.11-.171-.268-.151-.426.021-.158.115-.297.254-.374l1.689-.935-.937-1.558c-.081-.135-.094-.3-.035-.445.059-.146.183-.255.335-.296l1.922-.511-.466-1.732c-.04-.148-.009-.307.083-.43s.236-.196.39-.2l2.029-.042.045-1.805c.004-.149.074-.289.192-.381.117-.092.27-.127.416-.094l1.99.442.564-1.756c.045-.139.148-.251.282-.308.136-.055.287-.051.418.014l1.805.899 1.058-1.584c.08-.119.207-.199.35-.218.144-.021.287.024.395.119L18 4.172l1.484-1.291c.109-.095.253-.138.395-.119.143.019.269.099.35.218l1.057 1.583 1.807-.9c.13-.064.283-.069.417-.013.135.057.237.169.282.308l.562 1.756 1.991-.442c.146-.033.3.002.416.094.118.092.188.232.192.382l.045 1.804 2.028.042c.153.003.297.077.389.2.093.123.123.282.083.43l-.465 1.734 1.924.511c.152.041.276.15.336.296.059.146.046.311-.035.445l-.938 1.558 1.689.935c.14.077.233.216.254.374.021.158-.036.316-.151.426l-1.353 1.287 1.353 1.289c.115.11.172.268.151.426-.021.158-.115.296-.254.374l-1.688.934.938 1.557c.081.135.094.3.035.445-.06.145-.184.255-.335.296l-1.925.512.465 1.732c.04.148.01.307-.082.43-.093.123-.236.197-.39.2l-2.028.043-.045 1.804c-.004.149-.074.289-.192.381-.117.092-.271.126-.416.095l-1.991-.442-.562 1.757c-.045.139-.147.252-.282.309-.134.058-.284.053-.417-.014l-1.806-.899-1.058 1.585c-.08.12-.207.199-.35.219-.142.018-.286-.024-.395-.119L18 27.407l-1.483 1.294c-.092.08-.209.123-.329.123z"/><path fill="#8A4B38" d="M13.5 27.052h9c3.521 0 6.5 2.575 6.5 4.5 0 1.65-1.35 2-3 2H10c-1.65 0-3-.35-3-2 0-1.925 2.99-4.5 6.5-4.5z"/><path fill="#D99E82" d="M26.222 22.779c0 4.088-3.68 7.398-8.222 7.398s-8.222-3.31-8.222-7.398c0-4.087 3.68-7.4 8.222-7.4s8.222 3.313 8.222 7.4z"/><path fill="#E6E7E8" d="M21.289 26.479c0 2.043-1.473 3.699-3.289 3.699s-3.289-1.656-3.289-3.699S16.183 22.78 18 22.78s3.289 1.655 3.289 3.699z"/><path fill="#231F20" d="M19.645 27.711c0 .908-.736 1.645-1.645 1.645s-1.645-.736-1.645-1.645c0-.908.736-1.642 1.645-1.642s1.645.734 1.645 1.642zm-4.934-6.166c0 .682-.552 1.234-1.233 1.234s-1.233-.553-1.233-1.234c0-.68.552-1.232 1.233-1.232.681-.001 1.233.552 1.233 1.232zm9.044 0c0 .682-.552 1.234-1.232 1.234-.682 0-1.233-.553-1.233-1.234 0-.68.552-1.232 1.233-1.232.68-.001 1.232.552 1.232 1.232z"/><path fill="#C1694F" d="M11.422 17.846s4.111-1.644 4.933 0C17.178 19.49 18 19.49 18 19.49v-4.934c0 .001-6.578.001-6.578 3.29zm13.155 0s-4.11-1.644-4.933 0C18.822 19.49 18 19.49 18 19.49v-4.934c0 .001 6.577.001 6.577 3.29z"/><path fill="#D99E82" d="M12.245 18.256c0 1.136-.92 2.056-2.055 2.056-1.136 0-2.056-.92-2.056-2.056 0-1.135.92-2.055 2.056-2.055 1.135 0 2.055.92 2.055 2.055zm15.621 0c0 1.136-.92 2.056-2.056 2.056-1.135 0-2.056-.92-2.056-2.056 0-1.135.921-2.055 2.056-2.055 1.136 0 2.056.92 2.056 2.055zM11 35c-2 0-2-4 2-4s4.062 4 2 4h-4zm10 0c-2 0-2-4 2-4s4.062 4 2 4h-4z"/></svg>
\ No newline at end of file