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/1f468-200d-1f467-200d-1f467.svg b/public/emoji/1f468-200d-1f467-200d-1f467.svg
index b9b029f59..acb7b7df4 100644
--- a/public/emoji/1f468-200d-1f467-200d-1f467.svg
+++ b/public/emoji/1f468-200d-1f467-200d-1f467.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" d="M 0,0 36,0 36,36 0,36 0,0 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g transform="translate(15,14)" id="g12"><path id="path14" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 5,0 0,-3 1.861,0 0,-6 -9,0 0,6 L 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(18,35.8608)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.338,0 -2.602,-0.305 -3.739,-0.836 -0.197,0.017 0.8,0.03 0.6,0.03 -3.944,0 -7.139,-3.196 -7.139,-7.139 0,-3.123 2.009,-5.772 4.804,-6.74 1.625,-1.859 2.812,-3.038 5.474,-3.038 4.894,0 8.861,3.968 8.861,8.862 C 8.861,-3.967 4.894,0 0,0"/></g><g transform="translate(10,32)" id="g28"><path id="path30" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-10 0.024,0 c 0.253,-3.89 3.498,-6.969 7.476,-6.969 3.978,0 7.247,3.079 7.5,6.969 l 0,9 -15,1 z"/></g><g transform="translate(14,23)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(21,23)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(20.7219,18.2773)" id="g40"><path id="path42" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.222,0 -3.222,0 c 0,0 0.805,-1.61 3.222,-1.61 C -0.805,-1.61 0,0 0,0"/></g><g transform="translate(18,20.5)" id="g44"><path id="path46" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 C -1.276,0 -1.5,0.224 -1.5,0.5 -1.5,0.776 -1.276,1 -1,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(25.0347,14)" id="g48"><path id="path50" style="fill:#3b93d9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5,0 -7.472,-3.778 -10.035,0 -16,0 c -1.779,0 -1.945,-1.193 -1.945,-2.973 L -17.945,-15 3,-15 3,-2.973 C 3,-1 2,0 0,0"/></g><path id="path52" style="fill:#1b6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23.834,0 -1.028,0 0,10 1.028,0 0,-10 z"/><path id="path54" style="fill:#1b6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11.861,0 -1.028,0 0,10 1.028,0 0,-10 z"/><g transform="translate(26,26)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,6 -2,1 -13,0 0,-7 C -9.93,0 -6.451,2.576 -4.644,4.603 -4.079,2.83 -2.747,0 0,0"/></g><g transform="translate(16,11)" id="g60"><path id="path62" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.125,-3.313 1,-7 0,0 -3.344,-2 -8,-2 0,1.563 7,9 7,9"/></g><g transform="translate(2,10.875)" id="g64"><path id="path66" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.125,-3.188 -1,-6.875 0,0 3.344,-2 8,-2 C 7,-7.312 0,0 0,0"/></g><g transform="translate(9.875,17)" id="g68"><path id="path70" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.298,0 -0.588,-0.029 -0.875,-0.07 -1.162,-0.029 -1.452,0 -1.75,0 c -3.383,0 -6.125,-2.742 -6.125,-6.125 0,-3.383 2.742,-6.125 6.125,-6.125 0.298,0 0.588,0.029 0.875,0.07 0.287,-0.041 0.577,-0.07 0.875,-0.07 3.383,0 6.125,2.742 6.125,6.125 C 6.125,-2.742 3.383,0 0,0"/></g><g transform="translate(11,2)" id="g72"><path id="path74" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-2 6,0 0,2 -1,0 z"/></g><g transform="translate(14,3)" id="g76"><path id="path78" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,-2 -2,2 -2,0 c -3,0 -5,-2 -5,-4 l 9,0 9,0 C 4,-2.027 2,0 0,0"/></g><g transform="translate(15,13.2857)" id="g80"><path id="path82" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.286,0.857 -12,0 l 0,-4.286 0.002,0 c 0,-0.013 -0.002,-0.026 -0.002,-0.04 0,-3.291 2.685,-5.96 5.998,-5.96 3.312,0 5.997,2.669 5.997,5.96 0,0.014 -0.002,0.027 -0.002,0.04 L 0,-4.286 0,0 Z"/></g><g transform="translate(16,10.875)" id="g84"><path id="path86" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.875,2.625 -4.137,4.044 -13.125,2.625 -13.878,0 c 4.734,0 7.372,1.536 8.807,2.946 C -3.99,1.67 -2.163,0 0,0"/></g><g transform="translate(11,6)" id="g88"><path id="path90" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0.389,-1.333 2,-1.333 1.611,0 2,1.333 2,1.333"/></g><g transform="translate(9,6.5)" id="g92"><path id="path94" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.13,0 -0.26,0.05 -0.35,0.15 -0.1,0.09 -0.15,0.22 -0.15,0.35 0,0.13 0.05,0.26 0.15,0.36 C -0.18,1.03 0.17,1.04 0.36,0.851 0.45,0.76 0.5,0.63 0.5,0.5 0.5,0.37 0.45,0.24 0.35,0.15 0.26,0.05 0.13,0 0,0"/></g><g transform="translate(11,8)" id="g96"><path id="path98" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g><g transform="translate(7,8)" id="g100"><path id="path102" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g><g transform="translate(33,11)" id="g104"><path id="path106" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.125,-3.313 1,-7 0,0 -3.344,-2 -8,-2 0,1.563 7,9 7,9"/></g><g transform="translate(19,10.875)" id="g108"><path id="path110" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.125,-3.188 -1,-6.875 0,0 3.344,-2 8,-2 C 7,-7.312 0,0 0,0"/></g><g transform="translate(26.875,17)" id="g112"><path id="path114" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.298,0 -0.588,-0.029 -0.875,-0.07 -1.162,-0.029 -1.452,0 -1.75,0 c -3.383,0 -6.125,-2.742 -6.125,-6.125 0,-3.383 2.742,-6.125 6.125,-6.125 0.298,0 0.588,0.029 0.875,0.07 0.287,-0.041 0.577,-0.07 0.875,-0.07 3.383,0 6.125,2.742 6.125,6.125 C 6.125,-2.742 3.383,0 0,0"/></g><g transform="translate(28,2)" id="g116"><path id="path118" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-2 6,0 0,2 -1,0 z"/></g><g transform="translate(31,3)" id="g120"><path id="path122" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,-2 -2,2 -2,0 c -3,0 -5,-2 -5,-4 l 9,0 9,0 C 4,-2.027 2,0 0,0"/></g><g transform="translate(32,13.2857)" id="g124"><path id="path126" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.286,0.857 -12,0 l 0,-4.286 0.002,0 c 0,-0.013 -0.002,-0.026 -0.002,-0.04 0,-3.291 2.685,-5.96 5.998,-5.96 3.312,0 5.997,2.669 5.997,5.96 0,0.014 -0.002,0.027 -0.002,0.04 L 0,-4.286 0,0 Z"/></g><g transform="translate(33,10.875)" id="g128"><path id="path130" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.875,2.625 -4.137,4.044 -13.125,2.625 -13.878,0 c 4.734,0 7.372,1.536 8.807,2.946 C -3.99,1.67 -2.163,0 0,0"/></g><g transform="translate(28,6)" id="g132"><path id="path134" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0.389,-1.333 2,-1.333 1.611,0 2,1.333 2,1.333"/></g><g transform="translate(26,6.5)" id="g136"><path id="path138" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.13,0 -0.26,0.05 -0.35,0.15 -0.1,0.09 -0.15,0.22 -0.15,0.35 0,0.13 0.05,0.26 0.15,0.36 C -0.18,1.03 0.17,1.04 0.36,0.851 0.45,0.76 0.5,0.63 0.5,0.5 0.5,0.37 0.45,0.24 0.35,0.15 0.26,0.05 0.13,0 0,0"/></g><g transform="translate(28,8)" id="g140"><path id="path142" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g><g transform="translate(24,8)" id="g144"><path id="path146" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M15.438 22v-3h5v3h1.861v6h-9v-6z"/><path fill="#3B93D9" d="M25.472 22h-5L18 25.778 15.438 22H9.472c-1.779 0-1.945 1.193-1.945 2.973V36h20.945V24.973c0-1.973-1-2.973-3-2.973z"/><path fill="#1B6399" d="M23.486 26h1.028v10h-1.028zm-12 0h1.028v10h-1.028z"/><path fill="#FFDC5D" d="M25.438 14V5l-15-1v10h.024c.252 3.89 3.498 6.969 7.476 6.969 3.806 0 6.957-2.822 7.443-6.473.022-.165.046-.329.057-.496z"/><path fill="#FFAC33" d="M25.381 14.495c1.197-1.511 1.917-3.418 1.917-5.495 0-4.893-3.967-8.861-8.861-8.861-1.328 0-2.582.301-3.713.825.11-.007.379-.013.517-.017-3.916.032-7.082 3.213-7.082 7.137 0 2.058.884 3.898 2.278 5.199V10c6.07 0 9.549-2.576 11.356-4.603.491 1.542 1.565 3.883 3.644 4.466V14c-.01.167-.034.331-.056.495z"/><path fill="#BF6952" d="M21.16 17.723h-6.444s.805 1.61 3.222 1.61 3.222-1.61 3.222-1.61zM18.438 15.5h-1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M14.438 13c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm7 0c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/><path fill="#FFDC5D" d="M32.998 22.714l-4.286-.857-7.714.857V27H21l-.002.04c0 3.291 2.685 5.96 5.998 5.96 3.312 0 5.997-2.669 5.997-5.96l-.002-.04h.007v-4.286z"/><path fill="#F4900C" d="M33.995 25.192c0-.023.003-.044.003-.067l-.002-.039.002-.086-.006.006C33.928 21.679 31.216 19 27.873 19c-.298 0-.588.029-.875.07-.286-.041-.577-.07-.875-.07-3.383 0-6.125 2.742-6.125 6.125 0 0 .125 3.188-1 6.875 0 0 3.344 2 8 2s8-2 8-2c-.968-3.172-1.01-6.061-1.003-6.808zm-1.002 1.848c0 3.291-2.685 5.96-5.997 5.96s-5.997-2.669-5.997-5.96c-.001-.013.001-.027.001-.04h-.002v-1.911c4.172-.181 6.588-1.592 7.929-2.91.91 1.074 2.351 2.414 4.071 2.816V27h-.007l.002.04z"/><path fill="#FFDC5D" d="M28.998 34v-3h-4v3h-1v2h6v-2z"/><path fill="#EA596E" d="M31.998 33h-3l-2 2-2-2h-2c-2.493 0-4.276 1.385-4.814 3h17.632c-.518-1.602-2.159-3-3.818-3z"/><path fill="#BF6952" d="M28.998 30h-4s.389 1.333 2 1.333 2-1.333 2-1.333zm-2-.5c-.13 0-.26-.05-.35-.15-.1-.09-.15-.22-.15-.35s.05-.26.15-.36c.17-.17.52-.18.71.01.09.091.14.221.14.351s-.05.26-.15.35c-.09.099-.22.149-.35.149z"/><path fill="#662113" d="M28.998 28c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833zm-4 0c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833z"/><path fill="#FFDC5D" d="M14.998 22.714l-4.286-.857-7.714.857V27H3l-.002.04c0 3.291 2.685 5.96 5.998 5.96 3.312 0 5.997-2.669 5.997-5.96l-.002-.04h.007v-4.286z"/><path fill="#F4900C" d="M15.995 25.192c0-.023.003-.044.003-.067l-.002-.039.002-.086-.006.006C15.928 21.679 13.216 19 9.873 19c-.298 0-.588.029-.875.07-.286-.041-.577-.07-.875-.07-3.383 0-6.125 2.742-6.125 6.125 0 0 .125 3.188-1 6.875 0 0 3.344 2 8 2s8-2 8-2c-.968-3.172-1.01-6.061-1.003-6.808zm-1.002 1.848c0 3.291-2.685 5.96-5.997 5.96s-5.997-2.669-5.997-5.96C2.998 27.027 3 27.013 3 27h-.002v-1.911c4.172-.181 6.588-1.592 7.929-2.91.91 1.074 2.351 2.414 4.071 2.816V27h-.007l.002.04z"/><path fill="#FFDC5D" d="M10.998 34v-3h-4v3h-1v2h6v-2z"/><path fill="#EA596E" d="M13.998 33h-3l-2 2-2-2h-2C2.505 33 .722 34.385.184 36h17.632c-.518-1.602-2.159-3-3.818-3z"/><path fill="#BF6952" d="M10.998 30h-4s.389 1.333 2 1.333 2-1.333 2-1.333zm-2-.5c-.13 0-.26-.05-.35-.15-.1-.09-.15-.22-.15-.35s.05-.26.15-.36c.17-.17.52-.18.71.01.09.091.14.221.14.351s-.05.26-.15.35c-.09.099-.22.149-.35.149z"/><path fill="#662113" d="M10.998 28c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833zm-4 0c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833z"/></svg>
\ No newline at end of file