64 |
88 | {% else %}
89 |
65 |
66 |
67 |
68 |
69 |
74 | 75 | 76 |
77 | 78 |
79 |
80 |
86 |
87 |
70 |
71 |
72 | Add a comment
73 |74 | 75 | 76 |
77 | 78 |
79 |
80 |
If you have a bug/issue with the commenting system, please send me an email (my email is in the "About" section).
81 | 82 |
83 |
84 |
85 |
90 |
92 |
--------------------------------------------------------------------------------
/site/commentator/public/css/perfect-scrollbar.min.css:
--------------------------------------------------------------------------------
1 | /* perfect-scrollbar v0.6.13 */
2 | .ps-container{-ms-touch-action:auto;touch-action:auto;overflow:hidden !important;-ms-overflow-style:none}@supports (-ms-overflow-style: none){.ps-container{overflow:auto !important}}@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none){.ps-container{overflow:auto !important}}.ps-container.ps-active-x>.ps-scrollbar-x-rail,.ps-container.ps-active-y>.ps-scrollbar-y-rail{display:block;background-color:transparent}.ps-container.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail{background-color:#eee;opacity:.9}.ps-container.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail>.ps-scrollbar-x{background-color:#999;height:11px}.ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail{background-color:#eee;opacity:.9}.ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y{background-color:#999;width:11px}.ps-container>.ps-scrollbar-x-rail{display:none;position:absolute;opacity:0;-webkit-transition:background-color .2s linear, opacity .2s linear;-o-transition:background-color .2s linear, opacity .2s linear;-moz-transition:background-color .2s linear, opacity .2s linear;transition:background-color .2s linear, opacity .2s linear;bottom:0px;height:15px}.ps-container>.ps-scrollbar-x-rail>.ps-scrollbar-x{position:absolute;background-color:#aaa;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;-o-transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;-moz-transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;bottom:2px;height:6px}.ps-container>.ps-scrollbar-x-rail:hover>.ps-scrollbar-x,.ps-container>.ps-scrollbar-x-rail:active>.ps-scrollbar-x{height:11px}.ps-container>.ps-scrollbar-y-rail{display:none;position:absolute;opacity:0;-webkit-transition:background-color .2s linear, opacity .2s linear;-o-transition:background-color .2s linear, opacity .2s linear;-moz-transition:background-color .2s linear, opacity .2s linear;transition:background-color .2s linear, opacity .2s linear;right:0;width:15px}.ps-container>.ps-scrollbar-y-rail>.ps-scrollbar-y{position:absolute;background-color:#aaa;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;-o-transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;-moz-transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;transition:background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;right:2px;width:6px}.ps-container>.ps-scrollbar-y-rail:hover>.ps-scrollbar-y,.ps-container>.ps-scrollbar-y-rail:active>.ps-scrollbar-y{width:11px}.ps-container:hover.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail{background-color:#eee;opacity:.9}.ps-container:hover.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail>.ps-scrollbar-x{background-color:#999;height:11px}.ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail{background-color:#eee;opacity:.9}.ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y{background-color:#999;width:11px}.ps-container:hover>.ps-scrollbar-x-rail,.ps-container:hover>.ps-scrollbar-y-rail{opacity:.6}.ps-container:hover>.ps-scrollbar-x-rail:hover{background-color:#eee;opacity:.9}.ps-container:hover>.ps-scrollbar-x-rail:hover>.ps-scrollbar-x{background-color:#999}.ps-container:hover>.ps-scrollbar-y-rail:hover{background-color:#eee;opacity:.9}.ps-container:hover>.ps-scrollbar-y-rail:hover>.ps-scrollbar-y{background-color:#999}
3 |
--------------------------------------------------------------------------------
/test/commentator/usage_test.clj:
--------------------------------------------------------------------------------
1 | (ns commentator.usage-test
2 | (:require [cheshire.core :as json]
3 | [clojure.test :refer :all]
4 | [commentator.mock.s3 :as ms]
5 | [commentator.usage :as usage]
6 | [spy.assert :as assert]
7 | [spy.protocol :as protocol]))
8 |
9 | (deftest purge-cache-test
10 | (is (= {}
11 | (usage/purge-cache {})))
12 | (is (= {"mcorbin-fr" {}}
13 | (usage/purge-cache {"mcorbin-fr" {"20210201" {"/foo" {"10.0.0.1" 1}}}})))
14 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}}}
15 | (usage/purge-cache {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}}})))
16 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}}
17 | "foo.localhost" {(usage/now) {"/bar" {"10.0.0.2" 3}}}}
18 | (usage/purge-cache {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}
19 | "20210201" {"/foo" {"10.0.0.1" 1}}}
20 | "foo.localhost" {(usage/now) {"/bar" {"10.0.0.2" 3}}
21 | "20210201" {"/foo" {"10.0.0.1" 1}}}}))))
22 |
23 | (deftest add-request-test
24 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}}}
25 | (usage/add-request
26 | {}
27 | {:uri "/bar"
28 | :all-params {:website "mcorbin-fr" :path "/foo"}
29 | :remote-addr "10.0.0.1"})))
30 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 2}}}}
31 | (usage/add-request
32 | {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}}}
33 | {:uri "/foo"
34 | :all-params {:website "mcorbin-fr" :path "/foo"}
35 | :remote-addr "10.0.0.1"})))
36 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1
37 | "10.0.0.2" 1}}}}
38 | (usage/add-request
39 | {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1}}}}
40 | {:uri "/foo"
41 | :all-params {:website "mcorbin-fr" :path "/foo"}
42 | :remote-addr "10.0.0.2"})))
43 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1
44 | "10.0.0.2" 2}}}}
45 | (usage/add-request
46 | {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1
47 | "10.0.0.2" 1}}}}
48 | {:uri "/foo"
49 | :all-params {:website "mcorbin-fr" :path "/foo"}
50 | :remote-addr "10.0.0.2"})))
51 | (is (= {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1
52 | "10.0.0.2" 1}
53 | "/bar" {"10.0.0.3" 1}}}}
54 | (usage/add-request
55 | {"mcorbin-fr" {(usage/now) {"/foo" {"10.0.0.1" 1
56 | "10.0.0.2" 1}}}}
57 | {:uri "/foo"
58 | :all-params {:website "mcorbin-fr" :path "/bar"}
59 | :remote-addr "10.0.0.3"}))))
60 |
61 | (deftest sync-cache-test
62 | (let [store (ms/store-mock {:save-resource (constantly true)})
63 | now (usage/now)
64 | cache (atom {"mcorbin-fr" {now {"/foo" {"10.0.0.1" 1
65 | "10.0.0.2" 1}}}})]
66 | (usage/sync-cache cache store)
67 | (assert/called-with? (:save-resource (protocol/spies store))
68 | store
69 | "mcorbin-fr"
70 | (usage/resource-name now)
71 | (json/generate-string {"/foo" {"10.0.0.1" 1
72 | "10.0.0.2" 1}}))))
73 | (deftest compute-usage-for-day-test
74 | (is (= {:pages {"/foo" {:unique 3
75 | :total 20}}
76 | :unique 3
77 | :total 20}
78 | (usage/compute-usage-for-day {"/foo" {"10.0.0.1" 3
79 | "10.2.2.3" 15
80 | "10.2.2.4" 2}})))
81 | (is (= {:pages {"/foo" {:unique 3
82 | :total 20}
83 | "/bar" {:unique 1
84 | :total 2}
85 | "/foo/bar" {:unique 2
86 | :total 4}}
87 | :unique 6
88 | :total 26}
89 | (usage/compute-usage-for-day {"/foo" {"10.0.0.1" 3
90 | "10.2.2.3" 15
91 | "10.2.2.4" 2}
92 | "/bar" {"10.0.0.1" 2}
93 | "/foo/bar" {"10.2.3.10" 1
94 | "10.0.0.1" 3}}))))
95 |
--------------------------------------------------------------------------------
/site/commentator/public/css/theme-blue.css:
--------------------------------------------------------------------------------
1 |
2 | :root{
3 |
4 | --MAIN-TEXT-color:#323232; /* Color of text by default */
5 | --MAIN-TITLES-TEXT-color: #5e5e5e; /* Color of titles h2-h3-h4-h5 */
6 | --MAIN-LINK-color:#1C90F3; /* Color of links */
7 | --MAIN-LINK-HOVER-color:#167ad0; /* Color of hovered links */
8 | --MAIN-ANCHOR-color: #1C90F3; /* color of anchors on titles */
9 |
10 | --MENU-HOME-LINK-color: #323232; /* Color of the home button text */
11 | --MENU-HOME-LINK-HOVER-color: #5e5e5e; /* Color of the hovered home button text */
12 |
13 | --MENU-HEADER-BG-color:#1C90F3; /* Background color of menu header */
14 | --MENU-HEADER-BORDER-color:#33a1ff; /*Color of menu header border */
15 |
16 | --MENU-SEARCH-BG-color:#167ad0; /* Search field background color (by default borders + icons) */
17 | --MENU-SEARCH-BOX-color: #33a1ff; /* Override search field border color */
18 | --MENU-SEARCH-BOX-ICONS-color: #a1d2fd; /* Override search field icons color */
19 |
20 | --MENU-SECTIONS-ACTIVE-BG-color:#20272b; /* Background color of the active section and its childs */
21 | --MENU-SECTIONS-BG-color:#252c31; /* Background color of other sections */
22 | --MENU-SECTIONS-LINK-color: #ccc; /* Color of links in menu */
23 | --MENU-SECTIONS-LINK-HOVER-color: #e6e6e6; /* Color of links in menu, when hovered */
24 | --MENU-SECTION-ACTIVE-CATEGORY-color: #777; /* Color of active category text */
25 | --MENU-SECTION-ACTIVE-CATEGORY-BG-color: #fff; /* Color of background for the active category (only) */
26 |
27 | --MENU-VISITED-color: #33a1ff; /* Color of 'page visited' icons in menu */
28 | --MENU-SECTION-HR-color: #20272b; /* Color of Comments are disabled for this article
91 |separator in menu */ 29 | 30 | } 31 | 32 | body { 33 | color: var(--MAIN-TEXT-color) !important; 34 | } 35 | 36 | textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple=multiple]:focus { 37 | border-color: none; 38 | box-shadow: none; 39 | } 40 | 41 | h2, h3, h4, h5 { 42 | color: var(--MAIN-TITLES-TEXT-color) !important; 43 | } 44 | 45 | a { 46 | color: var(--MAIN-LINK-color); 47 | } 48 | 49 | .anchor { 50 | color: var(--MAIN-ANCHOR-color); 51 | } 52 | 53 | a:hover { 54 | color: var(--MAIN-LINK-HOVER-color); 55 | } 56 | 57 | #sidebar ul li.visited > a .read-icon { 58 | color: var(--MENU-VISITED-color); 59 | } 60 | 61 | #body a.highlight:after { 62 | display: block; 63 | content: ""; 64 | height: 1px; 65 | width: 0%; 66 | -webkit-transition: width 0.5s ease; 67 | -moz-transition: width 0.5s ease; 68 | -ms-transition: width 0.5s ease; 69 | transition: width 0.5s ease; 70 | background-color: var(--MAIN-LINK-HOVER-color); 71 | } 72 | #sidebar { 73 | background-color: var(--MENU-SECTIONS-BG-color); 74 | } 75 | #sidebar #header-wrapper { 76 | background: var(--MENU-HEADER-BG-color); 77 | color: var(--MENU-SEARCH-BOX-color); 78 | border-color: var(--MENU-HEADER-BORDER-color); 79 | } 80 | #sidebar .searchbox { 81 | border-color: var(--MENU-SEARCH-BOX-color); 82 | background: var(--MENU-SEARCH-BG-color); 83 | } 84 | #sidebar ul.topics > li.parent, #sidebar ul.topics > li.active { 85 | background: var(--MENU-SECTIONS-ACTIVE-BG-color); 86 | } 87 | #sidebar .searchbox * { 88 | color: var(--MENU-SEARCH-BOX-ICONS-color); 89 | } 90 | 91 | #sidebar a { 92 | color: var(--MENU-SECTIONS-LINK-color); 93 | } 94 | 95 | #sidebar a:hover { 96 | color: var(--MENU-SECTIONS-LINK-HOVER-color); 97 | } 98 | 99 | #sidebar ul li.active > a { 100 | background: var(--MENU-SECTION-ACTIVE-CATEGORY-BG-color); 101 | color: var(--MENU-SECTION-ACTIVE-CATEGORY-color) !important; 102 | } 103 | 104 | #sidebar hr { 105 | border-color: var(--MENU-SECTION-HR-color); 106 | } 107 | 108 | #body .tags a.tag-link { 109 | background-color: var(--MENU-HEADER-BG-color); 110 | } 111 | 112 | #body .tags a.tag-link:before { 113 | border-right-color: var(--MENU-HEADER-BG-color); 114 | } 115 | 116 | #homelinks { 117 | background: var(--MENU-HEADER-BG-color); 118 | background-color: var(--MENU-HEADER-BORDER-color); 119 | border-bottom-color: var(--MENU-HEADER-BORDER-color); 120 | } 121 | 122 | #homelinks a { 123 | color: var(--MENU-HOME-LINK-color); 124 | } 125 | 126 | #homelinks a:hover { 127 | color: var(--MENU-HOME-LINK-HOVERED-color); 128 | } -------------------------------------------------------------------------------- /site/commentator/public/css/theme-red.css: -------------------------------------------------------------------------------- 1 | 2 | :root{ 3 | 4 | --MAIN-TEXT-color:#323232; /* Color of text by default */ 5 | --MAIN-TITLES-TEXT-color: #5e5e5e; /* Color of titles h2-h3-h4-h5 */ 6 | --MAIN-LINK-color:#f31c1c; /* Color of links */ 7 | --MAIN-LINK-HOVER-color:#d01616; /* Color of hovered links */ 8 | --MAIN-ANCHOR-color: #f31c1c; /* color of anchors on titles */ 9 | 10 | --MENU-HOME-LINK-color: #ccc; /* Color of the home button text */ 11 | --MENU-HOME-LINK-HOVER-color: #e6e6e6; /* Color of the hovered home button text */ 12 | 13 | --MENU-HEADER-BG-color:#dc1010; /* Background color of menu header */ 14 | --MENU-HEADER-BORDER-color:#e23131; /*Color of menu header border */ 15 | 16 | --MENU-SEARCH-BG-color:#b90000; /* Search field background color (by default borders + icons) */ 17 | --MENU-SEARCH-BOX-color: #ef2020; /* Override search field border color */ 18 | --MENU-SEARCH-BOX-ICONS-color: #fda1a1; /* Override search field icons color */ 19 | 20 | --MENU-SECTIONS-ACTIVE-BG-color:#2b2020; /* Background color of the active section and its childs */ 21 | --MENU-SECTIONS-BG-color:#312525; /* Background color of other sections */ 22 | --MENU-SECTIONS-LINK-color: #ccc; /* Color of links in menu */ 23 | --MENU-SECTIONS-LINK-HOVER-color: #e6e6e6; /* Color of links in menu, when hovered */ 24 | --MENU-SECTION-ACTIVE-CATEGORY-color: #777; /* Color of active category text */ 25 | --MENU-SECTION-ACTIVE-CATEGORY-BG-color: #fff; /* Color of background for the active category (only) */ 26 | 27 | --MENU-VISITED-color: #ff3333; /* Color of 'page visited' icons in menu */ 28 | --MENU-SECTION-HR-color: #2b2020; /* Color of
separator in menu */ 29 | 30 | } 31 | 32 | body { 33 | color: var(--MAIN-TEXT-color) !important; 34 | } 35 | 36 | textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple=multiple]:focus { 37 | border-color: none; 38 | box-shadow: none; 39 | } 40 | 41 | h2, h3, h4, h5 { 42 | color: var(--MAIN-TITLES-TEXT-color) !important; 43 | } 44 | 45 | a { 46 | color: var(--MAIN-LINK-color); 47 | } 48 | 49 | .anchor { 50 | color: var(--MAIN-ANCHOR-color); 51 | } 52 | 53 | a:hover { 54 | color: var(--MAIN-LINK-HOVER-color); 55 | } 56 | 57 | #sidebar ul li.visited > a .read-icon { 58 | color: var(--MENU-VISITED-color); 59 | } 60 | 61 | #body a.highlight:after { 62 | display: block; 63 | content: ""; 64 | height: 1px; 65 | width: 0%; 66 | -webkit-transition: width 0.5s ease; 67 | -moz-transition: width 0.5s ease; 68 | -ms-transition: width 0.5s ease; 69 | transition: width 0.5s ease; 70 | background-color: var(--MAIN-LINK-HOVER-color); 71 | } 72 | #sidebar { 73 | background-color: var(--MENU-SECTIONS-BG-color); 74 | } 75 | #sidebar #header-wrapper { 76 | background: var(--MENU-HEADER-BG-color); 77 | color: var(--MENU-SEARCH-BOX-color); 78 | border-color: var(--MENU-HEADER-BORDER-color); 79 | } 80 | #sidebar .searchbox { 81 | border-color: var(--MENU-SEARCH-BOX-color); 82 | background: var(--MENU-SEARCH-BG-color); 83 | } 84 | #sidebar ul.topics > li.parent, #sidebar ul.topics > li.active { 85 | background: var(--MENU-SECTIONS-ACTIVE-BG-color); 86 | } 87 | #sidebar .searchbox * { 88 | color: var(--MENU-SEARCH-BOX-ICONS-color); 89 | } 90 | 91 | #sidebar a { 92 | color: var(--MENU-SECTIONS-LINK-color); 93 | } 94 | 95 | #sidebar a:hover { 96 | color: var(--MENU-SECTIONS-LINK-HOVER-color); 97 | } 98 | 99 | #sidebar ul li.active > a { 100 | background: var(--MENU-SECTION-ACTIVE-CATEGORY-BG-color); 101 | color: var(--MENU-SECTION-ACTIVE-CATEGORY-color) !important; 102 | } 103 | 104 | #sidebar hr { 105 | border-color: var(--MENU-SECTION-HR-color); 106 | } 107 | 108 | #body .tags a.tag-link { 109 | background-color: var(--MENU-HEADER-BG-color); 110 | } 111 | 112 | #body .tags a.tag-link:before { 113 | border-right-color: var(--MENU-HEADER-BG-color); 114 | } 115 | 116 | #homelinks { 117 | background: var(--MENU-HEADER-BG-color); 118 | background-color: var(--MENU-HEADER-BORDER-color); 119 | border-bottom-color: var(--MENU-HEADER-BORDER-color); 120 | } 121 | 122 | #homelinks a { 123 | color: var(--MENU-HOME-LINK-color); 124 | } 125 | 126 | #homelinks a:hover { 127 | color: var(--MENU-HOME-LINK-HOVERED-color); 128 | } -------------------------------------------------------------------------------- /site/commentator/public/css/theme-green.css: -------------------------------------------------------------------------------- 1 | 2 | :root{ 3 | 4 | --MAIN-TEXT-color:#323232; /* Color of text by default */ 5 | --MAIN-TITLES-TEXT-color: #5e5e5e; /* Color of titles h2-h3-h4-h5 */ 6 | --MAIN-LINK-color:#599a3e; /* Color of links */ 7 | --MAIN-LINK-HOVER-color:#3f6d2c; /* Color of hovered links */ 8 | --MAIN-ANCHOR-color: #599a3e; /* color of anchors on titles */ 9 | 10 | --MENU-HOME-LINK-color: #323232; /* Color of the home button text */ 11 | --MENU-HOME-LINK-HOVER-color: #5e5e5e; /* Color of the hovered home button text */ 12 | 13 | --MENU-HEADER-BG-color:#74b559; /* Background color of menu header */ 14 | --MENU-HEADER-BORDER-color:#9cd484; /*Color of menu header border */ 15 | 16 | --MENU-SEARCH-BG-color:#599a3e; /* Search field background color (by default borders + icons) */ 17 | --MENU-SEARCH-BOX-color: #84c767; /* Override search field border color */ 18 | --MENU-SEARCH-BOX-ICONS-color: #c7f7c4; /* Override search field icons color */ 19 | 20 | --MENU-SECTIONS-ACTIVE-BG-color:#1b211c; /* Background color of the active section and its childs */ 21 | --MENU-SECTIONS-BG-color:#222723; /* Background color of other sections */ 22 | --MENU-SECTIONS-LINK-color: #ccc; /* Color of links in menu */ 23 | --MENU-SECTIONS-LINK-HOVER-color: #e6e6e6; /* Color of links in menu, when hovered */ 24 | --MENU-SECTION-ACTIVE-CATEGORY-color: #777; /* Color of active category text */ 25 | --MENU-SECTION-ACTIVE-CATEGORY-BG-color: #fff; /* Color of background for the active category (only) */ 26 | 27 | --MENU-VISITED-color: #599a3e; /* Color of 'page visited' icons in menu */ 28 | --MENU-SECTION-HR-color: #18211c; /* Color of
separator in menu */ 29 | 30 | } 31 | 32 | body { 33 | color: var(--MAIN-TEXT-color) !important; 34 | } 35 | 36 | textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple=multiple]:focus { 37 | border-color: none; 38 | box-shadow: none; 39 | } 40 | 41 | h2, h3, h4, h5 { 42 | color: var(--MAIN-TITLES-TEXT-color) !important; 43 | } 44 | 45 | a { 46 | color: var(--MAIN-LINK-color); 47 | } 48 | 49 | .anchor { 50 | color: var(--MAIN-ANCHOR-color); 51 | } 52 | 53 | a:hover { 54 | color: var(--MAIN-LINK-HOVER-color); 55 | } 56 | 57 | #sidebar ul li.visited > a .read-icon { 58 | color: var(--MENU-VISITED-color); 59 | } 60 | 61 | #body a.highlight:after { 62 | display: block; 63 | content: ""; 64 | height: 1px; 65 | width: 0%; 66 | -webkit-transition: width 0.5s ease; 67 | -moz-transition: width 0.5s ease; 68 | -ms-transition: width 0.5s ease; 69 | transition: width 0.5s ease; 70 | background-color: var(--MAIN-LINK-HOVER-color); 71 | } 72 | #sidebar { 73 | background-color: var(--MENU-SECTIONS-BG-color); 74 | } 75 | #sidebar #header-wrapper { 76 | background: var(--MENU-HEADER-BG-color); 77 | color: var(--MENU-SEARCH-BOX-color); 78 | border-color: var(--MENU-HEADER-BORDER-color); 79 | } 80 | #sidebar .searchbox { 81 | border-color: var(--MENU-SEARCH-BOX-color); 82 | background: var(--MENU-SEARCH-BG-color); 83 | } 84 | #sidebar ul.topics > li.parent, #sidebar ul.topics > li.active { 85 | background: var(--MENU-SECTIONS-ACTIVE-BG-color); 86 | } 87 | #sidebar .searchbox * { 88 | color: var(--MENU-SEARCH-BOX-ICONS-color); 89 | } 90 | 91 | #sidebar a { 92 | color: var(--MENU-SECTIONS-LINK-color); 93 | } 94 | 95 | #sidebar a:hover { 96 | color: var(--MENU-SECTIONS-LINK-HOVER-color); 97 | } 98 | 99 | #sidebar ul li.active > a { 100 | background: var(--MENU-SECTION-ACTIVE-CATEGORY-BG-color); 101 | color: var(--MENU-SECTION-ACTIVE-CATEGORY-color) !important; 102 | } 103 | 104 | #sidebar hr { 105 | border-color: var(--MENU-SECTION-HR-color); 106 | } 107 | 108 | #body .tags a.tag-link { 109 | background-color: var(--MENU-HEADER-BG-color); 110 | } 111 | 112 | #body .tags a.tag-link:before { 113 | border-right-color: var(--MENU-HEADER-BG-color); 114 | } 115 | 116 | #homelinks { 117 | background: var(--MENU-HEADER-BG-color); 118 | background-color: var(--MENU-HEADER-BORDER-color); 119 | border-bottom-color: var(--MENU-HEADER-BORDER-color); 120 | } 121 | 122 | #homelinks a { 123 | color: var(--MENU-HOME-LINK-color); 124 | } 125 | 126 | #homelinks a:hover { 127 | color: var(--MENU-HOME-LINK-HOVERED-color); 128 | } -------------------------------------------------------------------------------- /site/commentator/public/css/theme-commentator.css: -------------------------------------------------------------------------------- 1 | 2 | :root{ 3 | 4 | --MAIN-TEXT-color:#323232; /* Color of text by default */ 5 | --MAIN-TITLES-TEXT-color: #5e5e5e; /* Color of titles h2-h3-h4-h5 */ 6 | --MAIN-LINK-color: #0007c9; /* Color of links */ 7 | --MAIN-LINK-HOVER-color:#0007c9; /* Color of hovered links */ 8 | --MAIN-ANCHOR-color: #1C90F3; /* color of anchors on titles */ 9 | 10 | --MENU-HOME-LINK-color: #323232; /* Color of the home button text */ 11 | --MENU-HOME-LINK-HOVER-color: #5e5e5e; /* Color of the hovered home button text */ 12 | 13 | --MENU-HEADER-BG-color: #0199b1 ; /* Background color of menu header */ 14 | --MENU-HEADER-BORDER-color :#fff; /*Color of menu header border */ 15 | 16 | --MENU-SEARCH-BG-color: #e6e6e6; /* Search field background color (by default borders + icons) */ 17 | --MENU-SEARCH-BOX-color: #33a1ff; /* Override search field border color */ 18 | --MENU-SEARCH-BOX-ICONS-color: #33a1ff; /* Override search field icons color */ 19 | 20 | --MENU-SECTIONS-ACTIVE-BG-color:#20272b; /* Background color of the active section and its childs */ 21 | --MENU-SECTIONS-BG-color:#252c31; /* Background color of other sections */ 22 | --MENU-SECTIONS-LINK-color: #ccc; /* Color of links in menu */ 23 | --MENU-SECTIONS-LINK-HOVER-color: #e6e6e6; /* Color of links in menu, when hovered */ 24 | --MENU-SECTION-ACTIVE-CATEGORY-color: black; /* Color of active category text */ 25 | --MENU-SECTION-ACTIVE-CATEGORY-BG-color: #fff; /* Color of background for the active category (only) */ 26 | 27 | --MENU-VISITED-color: #33a1ff; /* Color of 'page visited' icons in menu */ 28 | --MENU-SECTION-HR-color: #20272b; /* Color of
separator in menu */ 29 | 30 | } 31 | 32 | body { 33 | color: var(--MAIN-TEXT-color) !important; 34 | } 35 | 36 | textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple=multiple]:focus { 37 | border-color: none; 38 | box-shadow: none; 39 | } 40 | 41 | h2, h3, h4, h5 { 42 | color: var(--MAIN-TITLES-TEXT-color) !important; 43 | } 44 | 45 | a { 46 | color: var(--MAIN-LINK-color); 47 | } 48 | 49 | .anchor { 50 | color: var(--MAIN-ANCHOR-color); 51 | } 52 | 53 | a:hover { 54 | color: var(--MAIN-LINK-HOVER-color); 55 | } 56 | 57 | #sidebar ul li.visited > a .read-icon { 58 | color: var(--MENU-VISITED-color); 59 | } 60 | 61 | #body a.highlight:after { 62 | display: block; 63 | content: ""; 64 | height: 1px; 65 | width: 0%; 66 | -webkit-transition: width 0.5s ease; 67 | -moz-transition: width 0.5s ease; 68 | -ms-transition: width 0.5s ease; 69 | transition: width 0.5s ease; 70 | background-color: var(--MAIN-LINK-HOVER-color); 71 | } 72 | #sidebar { 73 | background-color: var(--MENU-SECTIONS-BG-color); 74 | } 75 | #sidebar #header-wrapper { 76 | background: var(--MENU-HEADER-BG-color); 77 | color: var(--MENU-SEARCH-BOX-color); 78 | border-color: var(--MENU-HEADER-BORDER-color); 79 | } 80 | #sidebar .searchbox { 81 | border-color: var(--MENU-SEARCH-BOX-color); 82 | background: var(--MENU-SEARCH-BG-color); 83 | } 84 | #sidebar ul.topics > li.parent, #sidebar ul.topics > li.active { 85 | background: var(--MENU-SECTIONS-ACTIVE-BG-color); 86 | } 87 | #sidebar .searchbox * { 88 | color: var(--MENU-SEARCH-BOX-ICONS-color); 89 | } 90 | 91 | #sidebar a { 92 | color: var(--MENU-SECTIONS-LINK-color); 93 | } 94 | 95 | #sidebar a:hover { 96 | color: var(--MENU-SECTIONS-LINK-HOVER-color); 97 | } 98 | 99 | #sidebar ul li.active > a { 100 | background: var(--MENU-SECTION-ACTIVE-CATEGORY-BG-color); 101 | color: var(--MENU-SECTION-ACTIVE-CATEGORY-color) !important; 102 | } 103 | 104 | #sidebar hr { 105 | border-color: var(--MENU-SECTION-HR-color); 106 | } 107 | 108 | #body .tags a.tag-link { 109 | background-color: var(--MENU-HEADER-BG-color); 110 | } 111 | 112 | #body .tags a.tag-link:before { 113 | border-right-color: var(--MENU-HEADER-BG-color); 114 | } 115 | 116 | #homelinks { 117 | background: var(--MENU-HEADER-BG-color); 118 | background-color: var(--MENU-HEADER-BORDER-color); 119 | border-bottom-color: var(--MENU-HEADER-BORDER-color); 120 | } 121 | 122 | #homelinks a { 123 | color: var(--MENU-HOME-LINK-color); 124 | } 125 | 126 | #homelinks a:hover { 127 | color: var(--MENU-HOME-LINK-HOVERED-color); 128 | } 129 | -------------------------------------------------------------------------------- /src/commentator/api.clj: -------------------------------------------------------------------------------- 1 | (ns commentator.api 2 | (:require [clojure.spec.alpha :as s] 3 | [commentator.comment :as comment] 4 | [commentator.config :as config] 5 | [commentator.event :as event] 6 | [commentator.handler :as handler] 7 | [commentator.spec :as spec])) 8 | 9 | (s/def ::answer ::spec/non-empty-string) 10 | (s/def ::comment-id ::comment/id) 11 | (s/def ::article ::spec/non-empty-string) 12 | (s/def ::timestamp pos-int?) 13 | (s/def ::signature ::spec/non-empty-string) 14 | 15 | (s/def ::path ::spec/non-empty-string) 16 | (s/def :usage/add (s/keys :req-un [::config/website 17 | ::path])) 18 | 19 | (s/def :comment/new (s/keys :req-un [::article 20 | ::comment/author 21 | ::comment/content 22 | ::config/website 23 | ::answer 24 | ::timestamp 25 | ::signature] 26 | :opt-un [::comment/author-website])) 27 | (s/def :comment/get (s/keys :req-un [::article 28 | ::config/website 29 | ::comment-id])) 30 | (s/def :comment/for-article (s/keys :req-un [::article 31 | ::config/website])) 32 | (s/def :comment/approve (s/keys :req-un [::article ::comment-id ::config/website])) 33 | (s/def :comment/delete (s/keys :req-un [::article ::comment-id ::config/website])) 34 | (s/def :comment/delete-article (s/keys :req-un [::article ::config/website])) 35 | (s/def :comment/admin-for-article (s/keys :req-un [::article ::config/website])) 36 | (s/def :challenge/random (s/keys :req-un [::article ::config/website])) 37 | 38 | (s/def :event/delete (s/keys :req-un [::event/id ::config/website])) 39 | (s/def :usage/day ::spec/non-empty-string) 40 | (s/def :usage/month ::spec/non-empty-string) 41 | (s/def :usage/year ::spec/non-empty-string) 42 | (s/def :usage/get-for-day (s/keys :req-un [::config/website 43 | :usage/day 44 | :usage/month 45 | :usage/year])) 46 | (s/def :event/list (s/keys :req-un [::config/website])) 47 | 48 | (def router 49 | [["/api/v1/comment/:website/:article" {:post {:spec :comment/new 50 | :handler handler/new-comment} 51 | :get {:spec :comment/for-article 52 | :handler handler/comments-for-article}}] 53 | ["/api/admin/comment/:website/:article" {:get {:handler handler/admin-for-article 54 | :auth true 55 | :spec :comment/admin-for-article} 56 | :delete {:spec :comment/delete-article 57 | :auth true 58 | :handler handler/delete-article-comments}}] 59 | ["/api/admin/comment/:website/:article/:comment-id" {:get {:spec :comment/get 60 | :auth true 61 | :handler handler/get-comment} 62 | :delete {:spec :comment/delete 63 | :auth true 64 | :handler handler/delete-comment} 65 | :post {:spec :comment/approve 66 | :auth true 67 | :handler handler/approve-comment}}] 68 | ["/api/v1/challenge/:website/:article" {:get {:handler handler/random-challenge 69 | :spec :challenge/random}}] 70 | ["/api/admin/event/:website" {:get {:spec :event/list 71 | :auth true 72 | :handler handler/list-events}}] 73 | ["/api/admin/event/:website/:id" {:delete {:spec :event/delete 74 | :auth true 75 | :handler handler/delete-event}}] 76 | ["/api/v1/usage/:website" {:post {:spec :usage/add 77 | :handler handler/usage}}] 78 | ["/api/admin/usage/:website/:year/:month/:day" {:get {:spec :usage/get-for-day 79 | :auth true 80 | :handler handler/get-usage-for-day}}] 81 | ["/healthz" {:get {:handler handler/healthz}}]]) 82 | -------------------------------------------------------------------------------- /src/commentator/usage.clj: -------------------------------------------------------------------------------- 1 | (ns commentator.usage 2 | (:require [cheshire.core :as json] 3 | [com.stuartsierra.component :as component] 4 | [commentator.rate-limit :as rl] 5 | [commentator.store :as store] 6 | [corbihttp.log :as log] 7 | [exoscale.ex :as ex]) 8 | (:import java.util.concurrent.ScheduledThreadPoolExecutor 9 | java.util.concurrent.TimeUnit 10 | java.time.LocalDate 11 | java.time.format.DateTimeFormatter)) 12 | 13 | (defprotocol IWebsiteUsage 14 | (new-request [this request] "Add this request to the website usage component") 15 | (usage-for-day [this website year month day] "Get the usage per article for the given day")) 16 | 17 | (def ^DateTimeFormatter formatter (DateTimeFormatter/ofPattern "yyyy/MM/dd")) 18 | 19 | (defn now 20 | [] 21 | (.format (LocalDate/now) formatter)) 22 | 23 | (defn add-request 24 | [cache request] 25 | (let [ip (rl/source-ip request) 26 | website (get-in request [:all-params :website]) 27 | path (get-in request [:all-params :path]) 28 | day (now)] 29 | (if (get-in cache [website day path ip]) 30 | (update-in cache [website day path ip] inc) 31 | (assoc-in cache [website day path ip] 1)))) 32 | 33 | (defn resource-name 34 | [day] 35 | (str "usage/" day)) 36 | 37 | (defn sync-cache 38 | [cache s3] 39 | (try 40 | (doseq [[website website-usage] @cache] 41 | (doseq [[day content] website-usage] 42 | (log/infof {} 43 | "sync usage cache for %s - %s" 44 | website 45 | day) 46 | (store/save-resource s3 47 | website 48 | (resource-name day) 49 | (json/generate-string content)))) 50 | (catch Exception e 51 | (log/error {} e "fail to sync cache")))) 52 | 53 | (defn load-cache 54 | [cache s3 website] 55 | (log/info {:website website} "loading usage cache") 56 | (let [day (now) 57 | day-resource (resource-name day)] 58 | (when (store/exists? s3 website day-resource) 59 | (swap! cache assoc-in [website day] (-> (store/get-resource s3 website day-resource) 60 | (json/parse-string)))))) 61 | 62 | (defn purge-cache 63 | [cache] 64 | (log/info {} "purge usage cache") 65 | (try 66 | (->> (map (fn [[website website-cache]] 67 | [website (select-keys website-cache [(now)])]) 68 | cache) 69 | (into {})) 70 | (catch Exception e 71 | (log/error {} e "fail to purge cache")))) 72 | 73 | (defn get-usage 74 | [website s3 day] 75 | (let [path (resource-name day)] 76 | (if (store/exists? s3 website path) 77 | (-> (store/get-resource s3 website path) 78 | (json/parse-string false)) 79 | (ex/ex-incorrect! (format "usage for day %s not found" day) 80 | {})))) 81 | 82 | (defn compute-usage-for-day 83 | [usage] 84 | (reduce 85 | (fn [state [url accesses]] 86 | (let [unique-page (count accesses) 87 | total-page (reduce #(+ %1 (second %2)) 0 accesses)] 88 | (-> (assoc-in state [:pages url] 89 | {:unique unique-page 90 | :total total-page}) 91 | (update :unique + unique-page) 92 | (update :total + total-page)))) 93 | {:unique 0 94 | :total 0} 95 | usage)) 96 | 97 | (defrecord WebsiteUsage [websites s3 cache executor] 98 | component/Lifecycle 99 | (start [this] 100 | (let [executor (ScheduledThreadPoolExecutor. 1) 101 | c (atom {})] 102 | (doseq [website websites] 103 | (load-cache c s3 website)) 104 | (.scheduleWithFixedDelay executor 105 | ^Runnable (fn [] 106 | (sync-cache c s3)) 107 | 20 108 | 60 109 | TimeUnit/SECONDS) 110 | (.scheduleWithFixedDelay executor 111 | ^Runnable (fn [] 112 | (swap! c purge-cache)) 113 | 60 114 | 14400 115 | TimeUnit/SECONDS) 116 | (assoc this :cache c :executor executor))) 117 | 118 | (stop [this] 119 | (when executor 120 | (.shutdown executor) 121 | (.awaitTermination executor 122 | 20 123 | TimeUnit/SECONDS) 124 | ;; sync one last time 125 | (sync-cache cache s3)) 126 | (assoc this :cache nil :executor nil)) 127 | IWebsiteUsage 128 | (new-request [_ request] 129 | (swap! cache add-request request)) 130 | (usage-for-day [_ website year month day] 131 | (-> (get-usage website s3 (format "%s/%s/%s" year month day)) 132 | compute-usage-for-day))) 133 | -------------------------------------------------------------------------------- /site/commentator/content/howto/use-it/_index.md: -------------------------------------------------------------------------------- 1 | --- 2 | title: Use it 3 | weight: 50 4 | disableToc: false 5 | --- 6 | 7 | Commentator stores the articles comments on a S3 compatible store. + 8 | Let's say we want to store comments for the blog `mcorbin.fr` for example. 9 | 10 | The first thing to do is to write the Commentator [configuration file](/howto/configuration/). 11 | 12 | As explained in the linked section of the documentation, several things are important. 13 | 14 | **Allow origin** 15 | 16 | The same Commentator instance can serve comments for several websites. You need to configure the list of websites in the `:allow-origin` section. 17 | 18 | **Rate limit** 19 | 20 | The `:rate-limit-minutes` option prevents users to create more than one comment every N minutes. 21 | 22 | The `x-forwarded-for` header is first used to get the user IP. If the header is not set it fallbacks to the request source IP. 23 | 24 | **Comment** 25 | 26 | Comments can be automatically approved by setting the `:auto-approve` value to `true`. By default, comments not approved by an administrator are not displayed. 27 | 28 | You also need to configure the `allowed-articles` key. It contains a map containing for each website the list of articles allowed to receive comments. For example: 29 | 30 | ```clojure 31 | {"mcorbin-fr" ["my-first-article" 32 | "my-second-article"]} 33 | ``` 34 | 35 | With this setup, only requests to create comments on the `/api/v1/comment/
'+e.replace(o,"$1")+"
"},onSelect:function(){}};for(var c in e)e.hasOwnProperty(c)&&(l[c]=e[c]);for(var a="object"==typeof l.selector?[l.selector]:document.querySelectorAll(l.selector),u=0;u','",'
",""].join("")),o="."+n.namespace+"-close"+(n.otherClose?","+n.otherClose:"");return n.$instance=i.clone().addClass(n.variant),n.$instance.on(n.closeTrigger+"."+n.namespace,function(e){if(!e.isDefaultPrevented()){var t=u(e.target);("background"===n.closeOnClick&&t.is("."+n.namespace)||"anywhere"===n.closeOnClick||t.closest(o).length)&&(n.close(e),e.preventDefault())}}),this},getContent:function(){if(!1!==this.persist&&this.$content)return this.$content;var t=this,e=this.constructor.contentFilters,n=function(e){return t.$currentTarget&&t.$currentTarget.attr(e)},r=n(t.targetAttr),i=t.target||r||"",o=e[t.type];if(!o&&i in e&&(o=e[i],i=t.target&&r),i=i||n("href")||"",!o)for(var a in e)t[a]&&(o=e[a],i=t[a]);if(!o){var s=i;if(i=null,u.each(t.contentFilters,function(){return(o=e[this]).test&&(i=o.test(s)),!i&&o.regex&&s.match&&s.match(o.regex)&&(i=s),!i}),!i)return"console"in window&&window.console.error("Featherlight: no content filter found "+(s?' for "'+s+'"':" (no target specified)")),!1}return o.process.call(t,i)},setContent:function(e){return this.$instance.removeClass(this.namespace+"-loading"),this.$instance.toggleClass(this.namespace+"-iframe",e.is("iframe")),this.$instance.find("."+this.namespace+"-inner").not(e).slice(1).remove().end().replaceWith(u.contains(this.$instance[0],e[0])?"":e),this.$content=e.addClass(this.namespace+"-inner"),this},open:function(t){var n=this;if(n.$instance.hide().appendTo(n.root),!(t&&t.isDefaultPrevented()||!1===n.beforeOpen(t))){t&&t.preventDefault();var e=n.getContent();if(e)return r.push(n),s(!0),n.$instance.fadeIn(n.openSpeed),n.beforeContent(t),u.when(e).always(function(e){n.setContent(e),n.afterContent(t)}).then(n.$instance.promise()).done(function(){n.afterOpen(t)})}return n.$instance.detach(),u.Deferred().reject().promise()},close:function(e){var t=this,n=u.Deferred();return!1===t.beforeClose(e)?n.reject():(0===i(t).length&&s(!1),t.$instance.fadeOut(t.closeSpeed,function(){t.$instance.detach(),t.afterClose(e),n.resolve()})),n.promise()},resize:function(e,t){if(e&&t&&(this.$content.css("width","").css("height",""),this.$content.parent().width()'+n.loading+"
","",{text:e})}}},functionAttributes:["beforeOpen","afterOpen","beforeContent","afterContent","beforeClose","afterClose"],readElementConfig:function(e,t){var r=this,i=new RegExp("^data-"+t+"-(.*)"),o={};return e&&e.attributes&&u.each(e.attributes,function(){var e=this.name.match(i);if(e){var t=this.value,n=u.camelCase(e[1]);if(0<=u.inArray(n,r.functionAttributes))t=new Function(t);else try{t=JSON.parse(t)}catch(e){}o[n]=t}}),o},extend:function(e,t){var n=function(){this.constructor=e};return n.prototype=this.prototype,e.prototype=new n,e.__super__=this.prototype,u.extend(e,this,t),e.defaults=e.prototype,e},attach:function(i,o,a){var s=this;"object"!=typeof o||o instanceof u!=!1||a||(a=o,o=void 0);var c,e=(a=u.extend({},a)).namespace||s.defaults.namespace,l=u.extend({},s.defaults,s.readElementConfig(i[0],e),a),t=function(e){var t=u(e.currentTarget),n=u.extend({$source:i,$currentTarget:t},s.readElementConfig(i[0],l.namespace),s.readElementConfig(e.currentTarget,l.namespace),a),r=c||t.data("featherlight-persisted")||new s(o,n);"shared"===r.persist?c=r:!1!==r.persist&&t.data("featherlight-persisted",r),n.$currentTarget.blur&&n.$currentTarget.blur(),r.open(e)};return i.on(l.openTrigger+"."+l.namespace,l.filter,t),{filter:l.filter,handler:t}},current:function(){var e=this.opened();return e[e.length-1]||null},opened:function(){var t=this;return i(),u.grep(r,function(e){return e instanceof t})},close:function(e){var t=this.current();if(t)return t.close(e)},_onReady:function(){var r=this;if(r.autoBind){var i=u(r.autoBind);i.each(function(){r.attach(u(this))}),u(document).on("click",r.autoBind,function(e){if(!e.isDefaultPrevented()){var t=u(e.currentTarget);if(i.length!==(i=i.add(t)).length){var n=r.attach(t);(!n.filter||0" ">")
49 | (string/replace "\"" """)))
50 |
51 | (defn sanitize
52 | [comment]
53 | (when (and (:author comment) (:content comment))
54 | (-> (update comment :author escape-html)
55 | (update :content escape-html))))
56 |
57 | (defn article-file-name
58 | [article]
59 | (str article ".json"))
60 |
61 | (defn allowed?
62 | [allowed-articles website article]
63 | (if-not allowed-articles
64 | ;; allowed-articles is optional
65 | true
66 | (let [articles (get allowed-articles website)]
67 | (if-not (and articles (articles article))
68 | (throw (ex/ex-info (format "Invalid article %s" article)
69 | [::invalid [:corbi/user ::ex/incorrect]]))
70 | true))))
71 |
72 | (defrecord CommentManager [auto-approve allowed-articles s3 lock cache]
73 | ICommentManager
74 | (article-exists? [_ website article]
75 | (store/exists? s3 website (article-file-name article)))
76 |
77 | (for-article [this website article]
78 | (for-article this website article false))
79 |
80 | (for-article [this website article all?]
81 | (allowed? allowed-articles website article)
82 | (if (article-exists? this website article)
83 | (let [{:keys [comments from-cache]}
84 | (if-let [cache-comments (c/lookup cache website article)]
85 | {:comments cache-comments :from-cache true}
86 | {:comments
87 | (coax/coerce
88 | ::comments
89 | (-> (store/get-resource s3 website (article-file-name article))
90 | (json/parse-string true)))
91 | :from-cache false})]
92 | (when-not from-cache
93 | ;; update the cache if the value was retrieved from s3
94 | (c/miss cache website article comments))
95 | (if all?
96 | (vec comments)
97 | (vec (filter :approved comments))))
98 | []))
99 |
100 | (delete-article [this website article]
101 | (log/infof {}
102 | "Delete comments for %s/%s"
103 | website
104 | article)
105 | (locking (lock/get-lock lock (str website "/" article))
106 | (when (article-exists? this website article)
107 | (c/evict cache website article)
108 | (store/delete-resource s3 website (article-file-name article)))))
109 |
110 | (add-comment [this website article comment]
111 | (allowed? allowed-articles website article)
112 | (locking (lock/get-lock lock (str website "/" article))
113 | (if (article-exists? this website article)
114 | (let [comments (for-article this website article true)]
115 | (log/infof {}
116 | "Adding comment %s for %s/%s"
117 | (:id comment)
118 | website
119 | article)
120 | (store/save-resource s3
121 | website
122 | (article-file-name article)
123 | (-> (conj comments
124 | (assoc comment :approved auto-approve))
125 | json/generate-string)))
126 | ;; first comment for this article
127 | (store/save-resource s3
128 | website
129 | (article-file-name article)
130 | (-> [comment]
131 | json/generate-string)))
132 | (c/evict cache website article))
133 | (log/info {:comment-id (:id comment)
134 | :article article}
135 | (format "New comment %s for article %s" (:id comment) article)))
136 |
137 | (approve-comment [this website article comment-id]
138 | (locking (lock/get-lock lock (str website "/" article))
139 | (if (article-exists? this website article)
140 | (let [{:keys [found comments]}
141 | (->> (for-article this website article true)
142 | (reduce (fn [state comment]
143 | (if (= (:id comment) comment-id)
144 | (-> (assoc state :found true)
145 | (update :comments conj (assoc comment :approved true)))
146 | (update state :comments conj comment)))
147 | {:found false
148 | :comments []}))]
149 | (when-not found
150 | (throw (ex/ex-info (format "Comment %s not found for article %s"
151 | comment-id
152 | article)
153 | [::not-found [:corbi/user ::ex/not-found]]
154 | {:article article
155 | :comment-id comment-id})))
156 | (store/save-resource s3
157 | website
158 | (article-file-name article)
159 | (json/generate-string comments))
160 | (c/evict cache website article)
161 | (log/info {:comment-id comment-id
162 | :article article}
163 | (format "Comment %s for article %s approved" comment-id article)))
164 | (throw (ex/ex-info (format "No comment for article %s"
165 | article)
166 | [::not-found [:corbi/user ::ex/not-found]]
167 | {:article article
168 | :comment-id comment-id})))))
169 |
170 | (delete-comment [this website article comment-id]
171 | (locking (lock/get-lock lock (str website "/" article))
172 | (if (article-exists? this website article)
173 | (let [comments (for-article this website article true)
174 | filtered (remove #(= (:id %) comment-id) comments)]
175 | (when (= (count comments)
176 | (count filtered))
177 | (throw (ex/ex-info (format "Comment %s not found for article %s"
178 | comment-id
179 | article)
180 | [::not-found [:corbi/user ::ex/not-found]]
181 | {:comment-id comment-id
182 | :article article})))
183 | (log/infof {}
184 | "deleting comment %s for %s/%s"
185 | comment-id
186 | website
187 | article)
188 | (store/save-resource s3
189 | website
190 | (article-file-name article)
191 | (json/generate-string filtered))
192 | (c/evict cache website article)
193 | (log/info {:comment-id comment-id
194 | :article article}
195 | (format "Comment %s for article %s deleted" comment-id article)))
196 | (throw (ex/ex-info (format "No comment for article %s"
197 | article)
198 | [::not-found [:corbi/user ::ex/not-found]]
199 | {:article article
200 | :comment-id comment-id})))))
201 |
202 | (get-comment [this website article comment-id]
203 | (if (article-exists? this website article)
204 | (if-let [comment (->> (for-article this website article true)
205 | (filter #(= (:id %) comment-id))
206 | first)]
207 | comment
208 | (throw (ex/ex-info (format "Comment %s not found for article %s"
209 | comment-id
210 | article)
211 | [::not-found [:corbi/user ::ex/not-found]]
212 | {:article article
213 | :comment-id comment-id})))
214 | (throw (ex/ex-info (format "No comment for article %s"
215 | article)
216 | [::not-found [:corbi/user ::ex/not-found]]
217 | {:article article
218 | :comment-id comment-id})))))
219 |
--------------------------------------------------------------------------------
/site/commentator/public/js/clipboard.min.js:
--------------------------------------------------------------------------------
1 | /*!
2 | * clipboard.js v2.0.4
3 | * https://zenorocha.github.io/clipboard.js
4 | *
5 | * Licensed MIT © Zeno Rocha
6 | */
7 | !function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(n){var o={};function r(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,r),e.l=!0,e.exports}return r.m=n,r.c=o,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=0)}([function(t,e,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;narticle-test
22 | (is (= "foo" (h/req->article {:all-params {:article "foo"}}))))
23 |
24 | (deftest req->comment-id-test
25 | (let [id (UUID/randomUUID)]
26 | (is (= id (h/req->comment-id {:all-params {:comment-id id}})))))
27 |
28 | (deftest req->event-id-test
29 | (let [id (UUID/randomUUID)]
30 | (is (= id (h/req->event-id {:all-params {:id id}})))))
31 |
32 | (deftest new-comment-test
33 | (let [lock (component/start (lock/map->Lock {}))
34 | store (ms/store-mock {:exists? (constantly true)
35 | :get-resource (constantly "[]")
36 | :save-resource (constantly nil)})
37 | comment-mng (ct/test-mng store)
38 | challenge-mng (ChallengeManager. {:type :questions
39 | :ttl 120
40 | :secret (cloak/mask "aezez")
41 | :questions [{:question "foo" :answer "bar"}]})
42 | event-mng (event/map->EventManager {:s3 store
43 | :lock lock})
44 | timestamp (System/currentTimeMillis)
45 | signature (-> (challenge/random-challenge challenge-mng website "foo")
46 | :signature)
47 | handler (h/map->Handler {:comment-manager comment-mng
48 | :event-manager event-mng
49 | :challenge-manager challenge-mng
50 | :rate-limiter (component/start (rl/map->SimpleRateLimiter {:rate-limit-minutes 1}))})]
51 | (let [response (h/new-comment handler {:all-params {:content "content"
52 | :website website
53 | :author "mcorbin"
54 | :answer "bar"
55 | :signature signature
56 | :timestamp timestamp
57 | :article "foo"}})]
58 | (is (= {:status 201
59 | :body {:message "Comment added"}}
60 | response)))
61 | (Thread/sleep 100)
62 | (let [calls (spy/calls (:save-resource (protocol/spies store)))
63 | [p1 p2 p3 p4] (first calls)
64 | [c1 :as comments] (json/parse-string p4 true)
65 | [pe1 pe2 pe3 pe4] (second calls)
66 | [e1 :as events] (json/parse-string pe4 true)]
67 | ;; 1 event 1 comment
68 | (is (= 2 (count calls)))
69 | (is (= store p1))
70 | (is (= store pe1))
71 | (is (= website p2))
72 | (is (= website pe2))
73 | (is (= "foo.json" p3))
74 | (is (= "events.json" pe3))
75 | (is (= 1 (count comments)))
76 | (is (= 1 (count events)))
77 | (is (= {:content "content"
78 | :author "mcorbin"
79 | :approved false}
80 | (select-keys c1 [:content :author :approved])))
81 | (is (uuid? (UUID/fromString (:id c1))))
82 | (is (pos-int? (:timestamp c1)))
83 | (is (= {:article "foo"
84 | :type "new-comment"}
85 | (select-keys e1 [:article :type]))))))
86 |
87 | (deftest get-comment-test
88 | (let [id (UUID/randomUUID)
89 | comments [{:id id
90 | :approved false}
91 | {:id (UUID/randomUUID)
92 | :approved false}]
93 | store (ms/store-mock {:exists? (constantly true)
94 | :get-resource (constantly (ct/js comments))})
95 | comment-mng (ct/test-mng store)
96 | handler (h/map->Handler {:comment-manager comment-mng})]
97 | (is (= {:status 200
98 | :body {:id id
99 | :approved false}}
100 | (h/get-comment handler {:all-params {:article "foo"
101 | :website website
102 | :comment-id id}})))
103 | (assert/called-with? (:exists? (protocol/spies store))
104 | store
105 | website
106 | "foo.json")
107 | (assert/called-with? (:get-resource (protocol/spies store))
108 | store
109 | website
110 | "foo.json")))
111 |
112 | (deftest comments-for-article-test
113 | (let [id1 (UUID/randomUUID)
114 | id2 (UUID/randomUUID)
115 | comments [{:id id1
116 | :approved true}
117 | {:id id2
118 | :approved false}]
119 | store (ms/store-mock {:exists? (constantly true)
120 | :get-resource (constantly (ct/js comments))})
121 | comment-mng (ct/test-mng store)
122 | handler (h/map->Handler {:comment-manager comment-mng})]
123 | (is (= {:status 200
124 | :body [{:id id1
125 | :approved true}]}
126 | (h/comments-for-article handler
127 | {:all-params {:article "foo"
128 | :website website}})))
129 | (assert/called-with? (:exists? (protocol/spies store))
130 | store
131 | website
132 | "foo.json")
133 | (assert/called-with? (:get-resource (protocol/spies store))
134 | store
135 | website
136 | "foo.json")))
137 |
138 | (deftest admin-for-article-test
139 | (let [id1 (UUID/randomUUID)
140 | id2 (UUID/randomUUID)
141 | comments [{:id id1
142 | :approved true}
143 | {:id id2
144 | :approved false}]
145 | store (ms/store-mock {:exists? (constantly true)
146 | :get-resource (constantly (ct/js comments))})
147 | comment-mng (ct/test-mng store)
148 | handler (h/map->Handler {:comment-manager comment-mng})]
149 | (is (= {:status 200
150 | :body comments}
151 | (h/admin-for-article handler
152 | {:all-params {:article "foo"
153 | :website website}})))
154 | (assert/called-with? (:exists? (protocol/spies store))
155 | store
156 | website
157 | "foo.json")
158 | (assert/called-with? (:get-resource (protocol/spies store))
159 | store
160 | website
161 | "foo.json")))
162 |
163 | (deftest delete-comment-test
164 | (let [id (UUID/randomUUID)
165 | events [{:id id
166 | :approved false}
167 | {:id (UUID/randomUUID)
168 | :approved false}]
169 | store (ms/store-mock {:exists? (constantly true)
170 | :get-resource (constantly (ct/js events))
171 | :save-resource (constantly true)})
172 | comment-mng (ct/test-mng store)
173 | handler (h/map->Handler {:comment-manager comment-mng})]
174 | (is (= {:status 200 :body {:message "Comment deleted"}}
175 | (h/delete-comment handler {:all-params {:article "foo"
176 | :website website
177 | :comment-id id}})))
178 | (assert/called-with? (:exists? (protocol/spies store))
179 | store
180 | website
181 | "foo.json")
182 | (assert/called-with? (:save-resource (protocol/spies store))
183 | store
184 | website
185 | "foo.json"
186 | (json/generate-string [(last events)]))))
187 |
188 | (deftest delete-article-comments-test
189 | (let [store (ms/store-mock {:exists? (constantly true)
190 | :delete-resource (constantly true)})
191 | comment-mng (ct/test-mng store)
192 | handler (h/map->Handler {:comment-manager comment-mng})]
193 | (is (= {:status 200 :body {:message "Comments deleted"}}
194 | (h/delete-article-comments handler {:all-params {:article "foo"
195 | :website website}})))
196 | (assert/called-with? (:exists? (protocol/spies store))
197 | store
198 | website
199 | "foo.json")
200 | (assert/called-with? (:delete-resource (protocol/spies store))
201 | store
202 | website
203 | "foo.json")))
204 |
205 | (deftest approve-comment-test
206 | (let [id (UUID/randomUUID)
207 | store (ms/store-mock {:exists? (constantly true)
208 | :save-resource (constantly true)
209 | :get-resource (constantly (ct/js [{:id id
210 | :approved false}]))})
211 | comment-mng (ct/test-mng store)
212 | handler (h/map->Handler {:comment-manager comment-mng})]
213 | (is (= {:status 200 :body {:message "Comment approved"}}
214 | (h/approve-comment handler {:all-params {:article "foo"
215 | :website website
216 | :comment-id id}})))
217 | (assert/called-with? (:exists? (protocol/spies store))
218 | store
219 | website
220 | "foo.json")
221 | (assert/called-with? (:save-resource (protocol/spies store))
222 | store
223 | website
224 | "foo.json"
225 | (json/generate-string [{:id id :approved true}]))))
226 |
227 | (deftest healthz-test
228 | (let [handler (h/map->Handler {})]
229 | (is (= {:status 200
230 | :body {:message "ok"}}
231 | (h/healthz handler {})))))
232 |
233 | (deftest not-found-test
234 | (let [handler (h/map->Handler {})]
235 | (is (= {:status 404
236 | :body {:error "not found"}}
237 | (h/not-found handler {})))))
238 |
--------------------------------------------------------------------------------
/site/commentator/public/js/jquery.sticky.js:
--------------------------------------------------------------------------------
1 | // Sticky Plugin v1.0.4 for jQuery
2 | // =============
3 | // Author: Anthony Garand
4 | // Improvements by German M. Bravo (Kronuz) and Ruud Kamphuis (ruudk)
5 | // Improvements by Leonardo C. Daronco (daronco)
6 | // Created: 02/14/2011
7 | // Date: 07/20/2015
8 | // Website: http://stickyjs.com/
9 | // Description: Makes an element on the page stick on the screen as you scroll
10 | // It will only set the 'top' and 'position' of your element, you
11 | // might need to adjust the width in some cases.
12 |
13 | (function (factory) {
14 | if (typeof define === 'function' && define.amd) {
15 | // AMD. Register as an anonymous module.
16 | define(['jquery'], factory);
17 | } else if (typeof module === 'object' && module.exports) {
18 | // Node/CommonJS
19 | module.exports = factory(require('jquery'));
20 | } else {
21 | // Browser globals
22 | factory(jQuery);
23 | }
24 | }(function ($) {
25 | var slice = Array.prototype.slice; // save ref to original slice()
26 | var splice = Array.prototype.splice; // save ref to original slice()
27 |
28 | var defaults = {
29 | topSpacing: 0,
30 | bottomSpacing: 0,
31 | className: 'is-sticky',
32 | wrapperClassName: 'sticky-wrapper',
33 | center: false,
34 | getWidthFrom: '',
35 | widthFromWrapper: true, // works only when .getWidthFrom is empty
36 | responsiveWidth: false,
37 | zIndex: 'inherit'
38 | },
39 | $window = $(window),
40 | $document = $(document),
41 | sticked = [],
42 | windowHeight = $window.height(),
43 | scroller = function() {
44 | var scrollTop = $window.scrollTop(),
45 | documentHeight = $document.height(),
46 | dwh = documentHeight - windowHeight,
47 | extra = (scrollTop > dwh) ? dwh - scrollTop : 0;
48 |
49 | for (var i = 0, l = sticked.length; i < l; i++) {
50 | var s = sticked[i],
51 | elementTop = s.stickyWrapper.offset().top,
52 | etse = elementTop - s.topSpacing - extra;
53 |
54 | //update height in case of dynamic content
55 | s.stickyWrapper.css('height', s.stickyElement.outerHeight());
56 |
57 | if (scrollTop <= etse) {
58 | if (s.currentTop !== null) {
59 | s.stickyElement
60 | .css({
61 | 'width': '',
62 | 'position': '',
63 | 'top': '',
64 | 'z-index': ''
65 | });
66 | s.stickyElement.parent().removeClass(s.className);
67 | s.stickyElement.trigger('sticky-end', [s]);
68 | s.currentTop = null;
69 | }
70 | }
71 | else {
72 | var newTop = documentHeight - s.stickyElement.outerHeight()
73 | - s.topSpacing - s.bottomSpacing - scrollTop - extra;
74 | if (newTop < 0) {
75 | newTop = newTop + s.topSpacing;
76 | } else {
77 | newTop = s.topSpacing;
78 | }
79 | if (s.currentTop !== newTop) {
80 | var newWidth;
81 | if (s.getWidthFrom) {
82 | padding = s.stickyElement.innerWidth() - s.stickyElement.width();
83 | newWidth = $(s.getWidthFrom).width() - padding || null;
84 | } else if (s.widthFromWrapper) {
85 | newWidth = s.stickyWrapper.width();
86 | }
87 | if (newWidth == null) {
88 | newWidth = s.stickyElement.width();
89 | }
90 | s.stickyElement
91 | .css('width', newWidth)
92 | .css('position', 'fixed')
93 | .css('top', newTop)
94 | .css('z-index', s.zIndex);
95 |
96 | s.stickyElement.parent().addClass(s.className);
97 |
98 | if (s.currentTop === null) {
99 | s.stickyElement.trigger('sticky-start', [s]);
100 | } else {
101 | // sticky is started but it have to be repositioned
102 | s.stickyElement.trigger('sticky-update', [s]);
103 | }
104 |
105 | if (s.currentTop === s.topSpacing && s.currentTop > newTop || s.currentTop === null && newTop < s.topSpacing) {
106 | // just reached bottom || just started to stick but bottom is already reached
107 | s.stickyElement.trigger('sticky-bottom-reached', [s]);
108 | } else if(s.currentTop !== null && newTop === s.topSpacing && s.currentTop < newTop) {
109 | // sticky is started && sticked at topSpacing && overflowing from top just finished
110 | s.stickyElement.trigger('sticky-bottom-unreached', [s]);
111 | }
112 |
113 | s.currentTop = newTop;
114 | }
115 |
116 | // Check if sticky has reached end of container and stop sticking
117 | var stickyWrapperContainer = s.stickyWrapper.parent();
118 | var unstick = (s.stickyElement.offset().top + s.stickyElement.outerHeight() >= stickyWrapperContainer.offset().top + stickyWrapperContainer.outerHeight()) && (s.stickyElement.offset().top <= s.topSpacing);
119 |
120 | if( unstick ) {
121 | s.stickyElement
122 | .css('position', 'absolute')
123 | .css('top', '')
124 | .css('bottom', 0)
125 | .css('z-index', '');
126 | } else {
127 | s.stickyElement
128 | .css('position', 'fixed')
129 | .css('top', newTop)
130 | .css('bottom', '')
131 | .css('z-index', s.zIndex);
132 | }
133 | }
134 | }
135 | },
136 | resizer = function() {
137 | windowHeight = $window.height();
138 |
139 | for (var i = 0, l = sticked.length; i < l; i++) {
140 | var s = sticked[i];
141 | var newWidth = null;
142 | if (s.getWidthFrom) {
143 | if (s.responsiveWidth) {
144 | newWidth = $(s.getWidthFrom).width();
145 | }
146 | } else if(s.widthFromWrapper) {
147 | newWidth = s.stickyWrapper.width();
148 | }
149 | if (newWidth != null) {
150 | s.stickyElement.css('width', newWidth);
151 | }
152 | }
153 | },
154 | methods = {
155 | init: function(options) {
156 | return this.each(function() {
157 | var o = $.extend({}, defaults, options);
158 | var stickyElement = $(this);
159 |
160 | var stickyId = stickyElement.attr('id');
161 | var wrapperId = stickyId ? stickyId + '-' + defaults.wrapperClassName : defaults.wrapperClassName;
162 | var wrapper = $('')
163 | .attr('id', wrapperId)
164 | .addClass(o.wrapperClassName);
165 |
166 | stickyElement.wrapAll(function() {
167 | if ($(this).parent("#" + wrapperId).length == 0) {
168 | return wrapper;
169 | }
170 | });
171 |
172 | var stickyWrapper = stickyElement.parent();
173 |
174 | if (o.center) {
175 | stickyWrapper.css({width:stickyElement.outerWidth(),marginLeft:"auto",marginRight:"auto"});
176 | }
177 |
178 | if (stickyElement.css("float") === "right") {
179 | stickyElement.css({"float":"none"}).parent().css({"float":"right"});
180 | }
181 |
182 | o.stickyElement = stickyElement;
183 | o.stickyWrapper = stickyWrapper;
184 | o.currentTop = null;
185 |
186 | sticked.push(o);
187 |
188 | methods.setWrapperHeight(this);
189 | methods.setupChangeListeners(this);
190 | });
191 | },
192 |
193 | setWrapperHeight: function(stickyElement) {
194 | var element = $(stickyElement);
195 | var stickyWrapper = element.parent();
196 | if (stickyWrapper) {
197 | stickyWrapper.css('height', element.outerHeight());
198 | }
199 | },
200 |
201 | setupChangeListeners: function(stickyElement) {
202 | if (window.MutationObserver) {
203 | var mutationObserver = new window.MutationObserver(function(mutations) {
204 | if (mutations[0].addedNodes.length || mutations[0].removedNodes.length) {
205 | methods.setWrapperHeight(stickyElement);
206 | }
207 | });
208 | mutationObserver.observe(stickyElement, {subtree: true, childList: true});
209 | } else {
210 | if (window.addEventListener) {
211 | stickyElement.addEventListener('DOMNodeInserted', function() {
212 | methods.setWrapperHeight(stickyElement);
213 | }, false);
214 | stickyElement.addEventListener('DOMNodeRemoved', function() {
215 | methods.setWrapperHeight(stickyElement);
216 | }, false);
217 | } else if (window.attachEvent) {
218 | stickyElement.attachEvent('onDOMNodeInserted', function() {
219 | methods.setWrapperHeight(stickyElement);
220 | });
221 | stickyElement.attachEvent('onDOMNodeRemoved', function() {
222 | methods.setWrapperHeight(stickyElement);
223 | });
224 | }
225 | }
226 | },
227 | update: scroller,
228 | unstick: function(options) {
229 | return this.each(function() {
230 | var that = this;
231 | var unstickyElement = $(that);
232 |
233 | var removeIdx = -1;
234 | var i = sticked.length;
235 | while (i-- > 0) {
236 | if (sticked[i].stickyElement.get(0) === that) {
237 | splice.call(sticked,i,1);
238 | removeIdx = i;
239 | }
240 | }
241 | if(removeIdx !== -1) {
242 | unstickyElement.unwrap();
243 | unstickyElement
244 | .css({
245 | 'width': '',
246 | 'position': '',
247 | 'top': '',
248 | 'float': '',
249 | 'z-index': ''
250 | })
251 | ;
252 | }
253 | });
254 | }
255 | };
256 |
257 | // should be more efficient than using $window.scroll(scroller) and $window.resize(resizer):
258 | if (window.addEventListener) {
259 | window.addEventListener('scroll', scroller, false);
260 | window.addEventListener('resize', resizer, false);
261 | } else if (window.attachEvent) {
262 | window.attachEvent('onscroll', scroller);
263 | window.attachEvent('onresize', resizer);
264 | }
265 |
266 | $.fn.sticky = function(method) {
267 | if (methods[method]) {
268 | return methods[method].apply(this, slice.call(arguments, 1));
269 | } else if (typeof method === 'object' || !method ) {
270 | return methods.init.apply( this, arguments );
271 | } else {
272 | $.error('Method ' + method + ' does not exist on jQuery.sticky');
273 | }
274 | };
275 |
276 | $.fn.unstick = function(method) {
277 | if (methods[method]) {
278 | return methods[method].apply(this, slice.call(arguments, 1));
279 | } else if (typeof method === 'object' || !method ) {
280 | return methods.unstick.apply( this, arguments );
281 | } else {
282 | $.error('Method ' + method + ' does not exist on jQuery.sticky');
283 | }
284 | };
285 | $(function() {
286 | setTimeout(scroller, 0);
287 | });
288 | }));
289 |
--------------------------------------------------------------------------------